@rancher/shell 0.3.3 → 0.3.5

package/middleware/authenticated.js

@@ -28,6 +28,30 @@ const getPackageFromRoute = (route) => {
 
 let beforeEachSetup = false;
 
+function findMeta(route, key) {
+  if (route?.meta) {
+    const meta = Array.isArray(route.meta) ? route.meta : [route.meta];
+
+    for (let i = 0; i < meta.length; i++) {
+      if (meta[i][key]) {
+        return meta[i][key];
+      }
+    }
+  }
+
+  return undefined;
+}
+
+export function getClusterFromRoute(to) {
+  let cluster = to.params?.cluster;
+
+  if (!cluster) {
+    cluster = findMeta(to, 'cluster');
+  }
+
+  return cluster;
+}
+
 export function getProductFromRoute(to) {
   let product = to.params?.product;
 
@@ -39,6 +63,11 @@ export function getProductFromRoute(to) {
     }
   }
 
+  // If still no product, see if the route indicates the product via route metadata
+  if (!product) {
+    product = findMeta(to, 'product');
+  }
+
   return product;
 }
 
@@ -279,6 +308,11 @@ export default async function({
   try {
     let clusterId = get(route, 'params.cluster');
 
+    // Route can provide cluster ID via metadata
+    if (!clusterId && route) {
+      clusterId = getClusterFromRoute(route);
+    }
+
     const pkg = getPackageFromRoute(route);
     const product = getProductFromRoute(route);
 

package/mixins/chart.js

@@ -292,7 +292,13 @@ export default {
       // use the first version provided by the Helm chart
       // as the default.
       if ( !this.query.versionName && this.chart.versions?.length ) {
-        this.query.versionName = this.chart.versions[0].version;
+        if (this.showPreRelease) {
+          this.query.versionName = this.chart.versions[0].version;
+        } else {
+          const firstRelease = this.chart.versions.find(v => !isPrerelease(v.version));
+
+          this.query.versionName = firstRelease?.version || this.chart.versions[0].version;
+        }
       }
 
       if ( !this.query.versionName ) {
@@ -341,6 +347,71 @@ export default {
       }
     }, // End of fetchChart
 
+    // Charts have an annotation that specifies any additional charts that should be installed at the same time eg CRDs
+    async fetchAutoInstallInfo() {
+      const out = [];
+      /*
+        An example value for auto is ["rancher-monitoring-crd=match"].
+        It is an array of chart names that lets Rancher know of other
+        charts that should be auto-installed at the same time.
+      */
+      const auto = (this.version?.annotations?.[CATALOG_ANNOTATIONS.AUTO_INSTALL] || '').split(/\s*,\s*/).filter(x => !!x).reverse();
+
+      for ( const constraint of auto ) {
+        const provider = this.$store.getters['catalog/versionSatisfying']({
+          constraint,
+          repoName:     this.chart.repoName,
+          repoType:     this.chart.repoType,
+          chartVersion: this.version.version,
+        });
+        /* An example return value for "provider":
+          [
+              {
+                  "name": "rancher-monitoring-crd",
+                  "version": "100.1.3+up19.0.3",
+                  "description": "Installs the CRDs for rancher-monitoring.",
+                  "apiVersion": "v1",
+                  "annotations": {
+                      "catalog.cattle.io/certified": "rancher",
+                      "catalog.cattle.io/hidden": "true",
+                      "catalog.cattle.io/namespace": "cattle-monitoring-system",
+                      "catalog.cattle.io/release-name": "rancher-monitoring-crd"
+                  },
+                  "type": "application",
+                  "urls": [
+                      "https://192.168.0.18:8005/k8s/clusters/c-m-hhpg69fv/v1/catalog.cattle.io.clusterrepos/rancher-charts?chartName=rancher-monitoring-crd&link=chart&version=100.1.3%2Bup19.0.3"
+                  ],
+                  "created": "2022-04-27T10:04:18.343124-07:00",
+                  "digest": "ecf07ba23a9cdaa7ffbbb14345d94ea1240b7f3b8e0ce9be4640e3e585c484e2",
+                  "key": "cluster/rancher-charts/rancher-monitoring-crd/100.1.3+up19.0.3",
+                  "repoType": "cluster",
+                  "repoName": "rancher-charts"
+              }
+          ]
+          */
+
+        if ( provider ) {
+          // more.push(provider);
+          try {
+            const crdVersionInfo = await this.$store.dispatch('catalog/getVersionInfo', {
+              repoType:    provider.repoType,
+              repoName:    provider.repoName,
+              chartName:   provider.name,
+              versionName: provider.version
+            });
+
+            out.push(crdVersionInfo);
+          } catch (e) {
+            console.error('Unable to fetch VersionInfo: ', e); // eslint-disable-line no-console
+          }
+        } else {
+          this.errors.push(`This chart requires ${ constraint } but no matching chart was found`);
+        }
+      }
+
+      this.$set(this, 'autoInstallInfo', out);
+    },
+
     selectVersion({ id: version }) {
       this.$router.applyQuery({ [VERSION]: version });
     },
@@ -361,7 +432,7 @@ export default {
         repoType: this.chart.repoType,
         repoName: this.chart.repoName,
         name:     this.chart.chartName,
-        version:  this.chart.versionName,
+        version:  this.query.versionName,
       };
 
       return {

package/mixins/resource-fetch.js

@@ -131,8 +131,8 @@ export default {
 
       const schema = this.$store.getters[`${ currStore }/schemaFor`](type);
 
-      if (schema?.attributes?.namespaced) {
-        opt.namespaced = this.namespaceFilter;
+      if (schema?.attributes?.namespaced) { // Is this specific resource namespaced (could be primary or secondary resource)?
+        opt.namespaced = this.namespaceFilter; // namespaceFilter will only be populated if applicable for primary resource
       }
 
       return this.$store.dispatch(`${ currStore }/findAll`, {

package/models/apps.statefulset.js

@@ -1,4 +1,6 @@
 import Workload from './workload';
+import { WORKLOAD_TYPES, POD } from '@shell/config/types';
+import { WORKLOAD_TYPE_TO_KIND_MAPPING } from '@shell/detail/workload/index';
 
 export default class StatefulSet extends Workload {
   async rollBack(cluster, statefulSet, revision) {
@@ -19,4 +21,30 @@ export default class StatefulSet extends Workload {
 
     await this.rollBackWorkload(cluster, statefulSet, 'statefulsets', body);
   }
+
+  // we need to provide a new pods getter for statefulsets because the relationship
+  // done on the parent model "workload" is not correct
+  get pods() {
+    const relationships = this.metadata?.relationships || [];
+    const podRelationship = relationships.filter(relationship => relationship.toType === POD)[0];
+
+    if (podRelationship) {
+      const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
+
+      return pods.filter((pod) => {
+        // a bit of a duplication of podRelationship, but always safe to check...
+        if (pod.metadata?.ownerReferences?.length) {
+          const ownerReferencesStatefulSet = pod.metadata?.ownerReferences?.find(own => own.kind === WORKLOAD_TYPE_TO_KIND_MAPPING[WORKLOAD_TYPES.STATEFUL_SET]);
+
+          if (ownerReferencesStatefulSet) {
+            return `${ pod.metadata.namespace }/${ ownerReferencesStatefulSet.name }` === this.id;
+          }
+        }
+
+        return false;
+      });
+    }
+
+    return [];
+  }
 }

package/models/cluster/node.js

@@ -1,5 +1,5 @@
 import { formatPercent } from '@shell/utils/string';
-import { CAPI as CAPI_ANNOTATIONS, NODE_ROLES, RKE } from '@shell/config/labels-annotations.js';
+import { CAPI as CAPI_ANNOTATIONS, NODE_ROLES, RKE, SYSTEM_LABELS } from '@shell/config/labels-annotations.js';
 import {
   CAPI, MANAGEMENT, METRIC, NORMAN, POD
 } from '@shell/config/types';
@@ -76,7 +76,8 @@ export default class ClusterNode extends SteveModel {
   }
 
   openSsh() {
-    this.provisionedMachine.openSsh();
+    // Pass in the name of the node, so we display that rather than the name of the provisioned machine
+    this.provisionedMachine.openSsh(this.nameDisplay);
   }
 
   downloadKeys() {
@@ -109,6 +110,26 @@ export default class ClusterNode extends SteveModel {
     return this.metadata?.labels || {};
   }
 
+  get customLabelCount() {
+    return this.customLabels.length;
+  }
+
+  get customLabels() {
+    const parsedLabels = [];
+
+    if (this.labels) {
+      for (const k in this.labels) {
+        const [prefix] = k.split('/');
+
+        if (!SYSTEM_LABELS.includes(prefix)) {
+          parsedLabels.push(`${ k }=${ this.labels[k] }`);
+        }
+      }
+    }
+
+    return parsedLabels;
+  }
+
   get isWorker() {
     return this.managementNode ? this.managementNode.isWorker : `${ this.labels[NODE_ROLES.WORKER] }` === 'true';
   }

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

@@ -98,10 +98,12 @@ export default class CapiMachine extends SteveModel {
     return false;
   }
 
-  openSsh() {
+  openSsh(name) {
+    const label = name || this.nameDisplay;
+
     this.$dispatch('wm/open', {
       id:        `${ this.id }-ssh`,
-      label:     this.nameDisplay,
+      label,
       icon:      'terminal',
       component: 'MachineSsh',
       attrs:     { machine: this, pod: {} }

package/models/clusterroletemplatebinding.js

@@ -21,4 +21,11 @@ export default class CRTB extends NormanModel {
   get clusterroletemplatebinding() {
     return this.$rootGetters[`management/byId`](MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, this.id?.replace(':', '/'));
   }
+
+  get steve() {
+    return this.$dispatch(`management/find`, {
+      type: MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING,
+      id:   this.id?.replace(':', '/')
+    }, { root: true });
+  }
 }

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

@@ -9,15 +9,20 @@ export const ENFORCEMENT_ACTION_VALUES = {
 export default class GateKeeperConstraint extends SteveModel {
   async save() {
     let constraint;
+    let resourceVersion;
 
     if (this.constraint) {
       constraint = await this.findLatestConstraint();
+      resourceVersion = constraint?.metadata?.resourceVersion;
     } else {
       constraint = await this.$dispatch('cluster/create', { type: `constraints.gatekeeper.sh.${ this.kind.toLowerCase() }` }, { root: true });
     }
 
     constraint.spec = this.spec;
     constraint.metadata = this.metadata;
+    if (resourceVersion) {
+      constraint.metadata.resourceVersion = resourceVersion;
+    }
 
     await constraint.save();
   }
@@ -50,6 +55,10 @@ export default class GateKeeperConstraint extends SteveModel {
     }, { root: true });
   }
 
+  get totalViolations() {
+    return this.status?.totalViolations || this.violations.length;
+  }
+
   get violations() {
     const violations = this.status?.violations || [];
 

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

@@ -1,8 +1,9 @@
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { CAPI, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { _RKE2 } from '@shell/store/prefs';
+import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml } from '@shell/utils/string';
 import { insertAt } from '@shell/utils/array';
-import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
-import SteveModel from '@shell/plugins/steve/steve-class';
 
 export default class FleetCluster extends SteveModel {
   get _availableActions() {
@@ -32,14 +33,16 @@ export default class FleetCluster extends SteveModel {
       enabled:  !!this.links.update
     });
 
-    insertAt(out, 3, {
-      action:     'assignTo',
-      label:      'Change workspace',
-      icon:       'icon icon-copy',
-      bulkable:   true,
-      bulkAction: 'assignToBulk',
-      enabled:    !!this.links.update && !!this.mgmt,
-    });
+    if (!this.isRke2) {
+      insertAt(out, 3, {
+        action:     'assignTo',
+        label:      'Change workspace',
+        icon:       'icon icon-copy',
+        bulkable:   true,
+        bulkAction: 'assignToBulk',
+        enabled:    !!this.links.update && !!this.mgmt,
+      });
+    }
 
     insertAt(out, 4, { divider: true });
 
@@ -75,6 +78,12 @@ export default class FleetCluster extends SteveModel {
     return false;
   }
 
+  get isRke2() {
+    const provider = this?.metadata?.labels?.[CAPI.PROVIDER] || this?.status?.provider;
+
+    return provider === _RKE2;
+  }
+
   get nameDisplay() {
     return this.metadata?.labels?.[FLEET_LABELS.CLUSTER_DISPLAY_NAME] || this.metadata?.name || this.id;
   }

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

@@ -96,9 +96,8 @@ export default class GitRepo extends SteveModel {
     const workspace = this.$getters['byId'](FLEET.WORKSPACE, this.metadata.namespace);
     const clusters = workspace?.clusters || [];
     const groups = workspace?.clusterGroups || [];
-    const out = [];
 
-    if ( workspace.id === 'fleet-local' ) {
+    if ( workspace?.id === 'fleet-local' ) {
       const local = findBy(groups, 'id', 'fleet-local/default');
 
       if ( local ) {
@@ -108,6 +107,12 @@ export default class GitRepo extends SteveModel {
       return [];
     }
 
+    if (!this.spec.targets) {
+      return [];
+    }
+
+    const out = [];
+
     for ( const tgt of this.spec.targets ) {
       if ( tgt.clusterName ) {
         const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);

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

@@ -196,7 +196,7 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get kubernetesVersionExtension() {
-    if ( this.kubernetesVersion.match(/[+-]]/) ) {
+    if ( this.kubernetesVersion.match(/[+-]/) ) {
       return this.kubernetesVersion.replace(/^.*([+-])/, '$1');
     }
 

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

@@ -66,6 +66,18 @@ export default class Workspace extends HybridModel {
     await norman.save();
   }
 
+  waitForWorkspaceSchema(timeout = 20000, schemaCallback) {
+    return this.waitForTestFn(() => {
+      const schema = this.$rootGetters['management/schemaFor'](FLEET.WORKSPACE);
+
+      if (!schemaCallback) {
+        return schema;
+      }
+
+      return schemaCallback(schema);
+    }, this.$rootGetters['i18n/t']('fleet.workspaces.timeout'), timeout);
+  }
+
   async remove() {
     const norman = await this.norman;
 

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

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

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

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

package/models/namespace.js

@@ -187,11 +187,7 @@ export default class Namespace extends SteveModel {
   }
 
   get _detailLocation() {
-    let _detailLocation = super._detailLocation;
-
-    if (this.$rootGetters['currentProduct'].hideNamespaceLocation) {
-      _detailLocation = false;
-    }
+    const _detailLocation = super._detailLocation;
 
     return _detailLocation;
   }
@@ -260,4 +256,8 @@ export default class Namespace extends SteveModel {
       this.metadata.labels[PROJECT] = project;
     }
   }
+
+  get hideDetailLocation() {
+    return !!this.$rootGetters['currentProduct'].hideNamespaceLocation;
+  }
 }

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

@@ -103,7 +103,7 @@ export default class ProvCluster extends SteveModel {
     const clusterTemplatesSchema = this.$getters['schemaFor']('management.cattle.io.clustertemplate');
     let canUpdateClusterTemplate = false;
 
-    if (clusterTemplatesSchema && (clusterTemplatesSchema.resourceMethods.includes('blocked-PUT') || clusterTemplatesSchema.resourceMethods.includes('PUT'))) {
+    if (clusterTemplatesSchema && (clusterTemplatesSchema.resourceMethods?.includes('blocked-PUT') || clusterTemplatesSchema.resourceMethods?.includes('PUT'))) {
       canUpdateClusterTemplate = true;
     }
 
@@ -272,7 +272,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get mgmtClusterId() {
-    return this.mgmt?.id || this.id.replace(`${ this.metadata.namespace }/`, '');
+    return this.mgmt?.id || this.id?.replace(`${ this.metadata.namespace }/`, '');
   }
 
   get mgmt() {
@@ -291,8 +291,10 @@ export default class ProvCluster extends SteveModel {
     return !!this.mgmt?.isReady;
   }
 
+  // nodeGroups can be undefined for an EKS cluster that has just been created and has not
+  // had any node groups added to it
   get eksNodeGroups() {
-    return this.mgmt?.spec?.eksConfig?.nodeGroups;
+    return this.mgmt?.spec?.eksConfig?.nodeGroups || [];
   }
 
   waitForProvisioner(timeout, interval) {
@@ -457,9 +459,9 @@ export default class ProvCluster extends SteveModel {
         return names.join('<br>');
       } else {
         const names = this.machines.filter((machine) => {
-          return machine.status.conditions.find(c => c.error && c.type === 'NodeHealthy');
+          return machine.status?.conditions?.find(c => c.error && c.type === 'NodeHealthy');
         }).map((machine) => {
-          if (machine.status.nodeRef?.name) {
+          if (machine.status?.nodeRef?.name) {
             return this.t('cluster.availabilityWarnings.node', { name: machine.status.nodeRef.name });
           }