@rancher/shell 1.2.0 → 2.0.0

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

@@ -99,42 +99,6 @@ export default class Project extends HybridModel {
     // and the PUT request should have a query param _replace=true.
     const newValue = await norman.save({ replace: forceReplaceOnReq });
 
-    let retryCount = 0;
-
-    const finishProjectCreation = async() => {
-      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 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;
-          }
-        }
-      }
-    };
-
-    // Only update PSP template if the value changed
-    const newPSPTemplateID = this.spec.podSecurityPolicyTemplateId || null;
-
-    if (norman.podSecurityPolicyTemplateId !== newPSPTemplateID) {
-      await finishProjectCreation();
-    }
-
     return newValue;
   }
 

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

@@ -1,5 +1,6 @@
 import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { isServerUrl } from '@shell/utils/validators/setting';
 
 export default class Setting extends HybridModel {
   get fromEnv() {
@@ -31,12 +32,15 @@ export default class Setting extends HybridModel {
   }
 
   get customValidationRules() {
-    return [
-      {
-        path:           'value',
-        translationKey: 'setting.serverUrl.https',
-        validators:     [`isHttps:${ this.metadata.name }`]
-      },
-    ];
+    const out = [];
+
+    if (isServerUrl(this.metadata.name)) {
+      out.push({
+        path:       'value',
+        validators: ['required', 'https', 'url', 'trailingForwardSlash']
+      });
+    }
+
+    return out;
   }
 }

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

@@ -223,7 +223,7 @@ export default class User extends HybridModel {
     return [
       {
         action:     'activate',
-        label:      this.t('action.activate'),
+        label:      this.t('action.enable'),
         icon:       'icon icon-play',
         bulkable:   true,
         bulkAction: 'activateBulk',
@@ -232,7 +232,7 @@ export default class User extends HybridModel {
       },
       {
         action:     'deactivate',
-        label:      this.t('action.deactivate'),
+        label:      this.t('action.disable'),
         icon:       'icon icon-pause',
         bulkable:   true,
         bulkAction: 'deactivateBulk',

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

@@ -4,6 +4,8 @@ import { MONITORING } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
+// i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
+// i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
   {
     name:  'slack',
@@ -66,7 +68,7 @@ export default class Receiver extends SteveModel {
   }
 
   async save() {
-    const errors = await this.validationErrors(this);
+    const errors = this.validationErrors(this);
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);

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

@@ -34,7 +34,7 @@ export default class Route extends SteveModel {
   }
 
   async save() {
-    const errors = await this.validationErrors(this);
+    const errors = this.validationErrors(this);
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);

package/models/namespace.js

@@ -87,7 +87,7 @@ export default class Namespace extends SteveModel {
       return true;
     }
 
-    if ( this.metadata.name.endsWith('-system') ) {
+    if ( this.metadata.name.startsWith('cattle-') && this.metadata.name.endsWith('-system') ) {
       return true;
     }
 

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

@@ -44,7 +44,8 @@ export default class Ingress extends SteveModel {
     const isTargetsWorkload = serviceName.startsWith('ingress-');
     const id = `${ this.namespace }/${ serviceName }`;
 
-    if ( isTargetsWorkload ) {
+    if (isTargetsWorkload) {
+      // Need to expose workloadId's and fetch specific ones in IngressTarget?
       const workload = workloads.find((w) => w.id === (id));
 
       return workload?.detailLocation || '';

package/models/nodedriver.js

@@ -0,0 +1,68 @@
+import Driver from '@shell/models/driver';
+
+export default class NodeDriver extends Driver {
+  get doneRoute() {
+    return 'c-cluster-manager-driver-nodedriver';
+  }
+
+  get _availableActions() {
+    const out = [
+      {
+        action:   'activate',
+        label:    'Activate',
+        icon:     'icon icon-play',
+        bulkable: true,
+        enabled:  !!this.actions.activate && this.state === 'inactive',
+      },
+      {
+        action:   'deactivate',
+        label:    'Deactivate',
+        icon:     'icon icon-pause',
+        bulkable: true,
+        enabled:  !!this.actions.deactivate && this.state === '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.update && !this.active,
+        weight:     -10,
+      }
+    ];
+
+    return out;
+  }
+
+  deactivate() {
+    this.$dispatch('promptModal', {
+      componentProps: { url: `v3/nodeDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  activate() {
+    return this.$dispatch('rancher/request', {
+      url:    `v3/nodeDrivers/${ escape(this.id) }?action=activate`,
+      method: 'post',
+    }, { root: true });
+  }
+}

package/models/pod.js

@@ -3,6 +3,7 @@ import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/reso
 import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
 import WorkloadService from '@shell/models/workload.service';
+import { deleteProperty } from '@shell/utils/object';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -256,4 +257,23 @@ export default class Pod extends WorkloadService {
       return Promise.reject(e);
     });
   }
+
+  cleanForSave(data) {
+    const val = super.cleanForSave(data);
+
+    // remove fields from containers
+    val.spec?.containers?.forEach((container) => {
+      this.cleanContainerForSave(container);
+    });
+
+    // remove fields from initContainers
+    val.spec?.initContainers?.forEach((container) => {
+      this.cleanContainerForSave(container);
+    });
+
+    // This is probably added by generic workload components that shouldn't be added to pods
+    deleteProperty(val, 'spec.selector');
+
+    return val;
+  }
 }

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

@@ -1,5 +1,5 @@
 import {
-  CAPI, MANAGEMENT, NORMAN, SNAPSHOT, HCI
+  CAPI, MANAGEMENT, NAMESPACE, NORMAN, SNAPSHOT, HCI, LOCAL_CLUSTER
 } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { findBy } from '@shell/utils/array';
@@ -9,7 +9,8 @@ import { ucFirst } from '@shell/utils/string';
 import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
-import { CAPI as CAPI_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
+import capitalize from 'lodash/capitalize';
 
 /**
  * Class representing Cluster resource.
@@ -180,6 +181,16 @@ export default class ProvCluster extends SteveModel {
     return out;
   }
 
+  async findNormanCluster() {
+    const name = this.status?.clusterName;
+
+    if ( !name ) {
+      return null;
+    }
+
+    return await this.$dispatch('rancher/find', { type: NORMAN.CLUSTER, id: name }, { root: true });
+  }
+
   explore() {
     const location = {
       name:   'c-cluster',
@@ -239,10 +250,39 @@ export default class ProvCluster extends SteveModel {
     return providers.includes(this.provisioner);
   }
 
+  get isPrivateHostedProvider() {
+    if (this.isHostedKubernetesProvider && this.mgmt && this.provisioner) {
+      switch (this.provisioner.toLowerCase()) {
+      case 'gke':
+        return this.mgmt.spec?.gkeConfig?.privateClusterConfig?.enablePrivateEndpoint;
+      case 'eks':
+        return this.mgmt.spec?.eksConfig?.privateAccess;
+      case 'aks':
+        return this.mgmt.spec?.aksConfig?.privateCluster;
+      }
+    }
+
+    return false;
+  }
+
+  get isLocal() {
+    return this.mgmt?.isLocal;
+  }
+
   get isImported() {
     // As of Rancher v2.6.7, this returns false for imported K3s clusters,
     // in which this.provisioner is `k3s`.
-    return this.provisioner === 'imported';
+
+    const isImportedProvisioner = this.provisioner === 'imported';
+    const isImportedSpecialCases = this.mgmt?.providerForEmberParam === 'import' ||
+      // when imported cluster is GKE
+      !!this.mgmt?.spec?.gkeConfig?.imported ||
+      // or AKS
+      !!this.mgmt?.spec?.aksConfig?.imported ||
+      // or EKS
+      !!this.mgmt?.spec?.eksConfig?.imported;
+
+    return !this.isLocal && (isImportedProvisioner || (!this.isRke2 && !this.mgmt?.machineProvider && isImportedSpecialCases));
   }
 
   get isCustom() {
@@ -262,8 +302,6 @@ 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.isK3s;
   }
 
@@ -272,7 +310,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isK3s() {
-    return this.mgmt?.status?.provider === 'k3s';
+    return this.mgmt?.status ? this.mgmt?.status.provider === 'k3s' : (this.spec?.kubernetesVersion || '').includes('k3s') ;
   }
 
   get isRke2() {
@@ -280,7 +318,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get isRke1() {
-    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig;
+    return !!this.mgmt?.spec?.rancherKubernetesEngineConfig || this.labels['provider.cattle.io'] === 'rke';
   }
 
   get isHarvester() {
@@ -366,6 +404,38 @@ export default class ProvCluster extends SteveModel {
     return this.mgmt?.providerLogo;
   }
 
+  get nodesArchitecture() {
+    const obj = {};
+
+    this.nodes?.forEach((node) => {
+      if (!node.metadata?.state?.transitioning) {
+        const architecture = node.status?.nodeLabels?.[NODE_ARCHITECTURE];
+
+        const key = architecture ? capitalize(architecture) : this.t('cluster.architecture.label.unknown');
+
+        obj[key] = (obj[key] || 0) + 1;
+      }
+    });
+
+    return obj;
+  }
+
+  get architecture() {
+    const keys = Object.keys(this.nodesArchitecture);
+
+    switch (keys.length) {
+    case 0:
+      return { label: this.t('generic.provisioning') };
+    case 1:
+      return { label: keys[0] };
+    default:
+      return {
+        label:   this.t('cluster.architecture.label.mixed'),
+        tooltip: keys.reduce((acc, k) => `${ acc }${ k }: ${ this.nodesArchitecture[k] }<br>`, '')
+      };
+    }
+  }
+
   get kubernetesVersion() {
     const unknown = this.$rootGetters['i18n/t']('generic.unknown');
 
@@ -815,11 +885,11 @@ export default class ProvCluster extends SteveModel {
   get agentConfig() {
     // The one we want is the first one with no selector.
     // If there are multiple with no selector, that will fall under the unsupported message below.
-    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector).config;
+    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector)?.config;
   }
 
   get cloudProvider() {
-    return this.agentConfig['cloud-provider-name'];
+    return this.agentConfig?.['cloud-provider-name'];
   }
 
   get canClone() {
@@ -869,6 +939,51 @@ export default class ProvCluster extends SteveModel {
   }
 
   get hasError() {
-    return this.status?.conditions?.some((condition) => condition.error === true);
+    // Before we were just checking for this.status?.conditions?.some((condition) => condition.error === true)
+    // but this is wrong as an error might exist but it might not be meaningful in the context of readiness of a cluster
+    // which is what this 'hasError' is used for.
+    // We now check if there's a ready condition after an error, which helps dictate the readiness of a cluster
+    // Based on the findings in https://github.com/rancher/dashboard/issues/10043
+    if (this.status?.conditions && this.status?.conditions.length) {
+      // if there are errors, we compare with how recent the "Ready" condition is compared to that error, otherwise we just move on
+      if (this.status?.conditions.some((c) => c.error === true)) {
+        // there's no ready condition and has an error, mark it
+        if (!this.status?.conditions.some((c) => c.type === 'Ready')) {
+          return true;
+        }
+
+        const filteredConditions = this.status?.conditions.filter((c) => c.error === true || c.type === 'Ready');
+        const mostRecentCondition = filteredConditions.reduce((a, b) => ((a.lastUpdateTime > b.lastUpdateTime) ? a : b));
+
+        return mostRecentCondition.error;
+      }
+    }
+
+    return false;
+  }
+
+  get namespaceLocation() {
+    const localCluster = this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, LOCAL_CLUSTER);
+
+    if (localCluster) {
+      return {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          cluster:  localCluster.id,
+          product:  this.$rootGetters['productId'],
+          resource: NAMESPACE,
+          id:       this.namespace
+        }
+      };
+    }
+
+    return null;
+  }
+
+  // JSON Paths that should be folded in the YAML editor by default
+  get yamlFolding() {
+    return [
+      'spec.rkeConfig.machinePools.dynamicSchemaSpec',
+    ];
   }
 }

package/models/schema.js

@@ -1,17 +1,38 @@
 import Resource from '@shell/plugins/dashboard-store/resource-class';
 
+/**
+ * For types see schema.d.ts
+ */
 export default class Schema extends Resource {
   get groupName() {
     return this.attributes.namespaced ? 'ns' : 'cluster';
   }
 }
 
-export function parseType(str) {
-  if ( str.startsWith('array[') ) {
-    return ['array', ...parseType(str.slice(6, -1))];
-  } else if ( str.startsWith('map[') ) {
-    return ['map', ...parseType(str.slice(4, -1))];
-  } else {
-    return [str];
+/**
+ * Handles
+ * - no subtype { type: 'io.cattle.provisioning.v1.Cluster.status' }
+ * - traditional map/array's with sub type in type e.g `{ type: array[io.cattle.provisioning.v1.Cluster.status] }`
+ * - new schema definitions map/array's with sub type property e.g. `{ type: 'array', subtype: 'io.cattle.provisioning.v1.Cluster.status' }`
+ */
+const mapArrayTypeRegex = /([^[\s]*)(\[(.*)\])?/;
+
+/**
+ * For the given resourceField find the root type and, if a collection of types, it's subtype
+ *
+ * @param {String} str type, may contain sub type
+ * @param {ResourceField} field resourceField entry, may contain sub type
+ * @returns [type, subtype]
+ */
+export function parseType(str, field) {
+  const regexRes = mapArrayTypeRegex.exec(str);
+
+  const subtype = regexRes[3] || field?.subtype;
+  const res = [regexRes[1]];
+
+  if (subtype) {
+    res.push(subtype);
   }
+
+  return res;
 }