@rancher/shell 3.0.5-rc.2 → 3.0.5-rc.5

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

@@ -0,0 +1,228 @@
+import { parse } from '@shell/utils/url';
+import { insertAt } from '@shell/utils/array';
+import { set } from '@shell/utils/object';
+import { SOURCE_TYPE } from '@shell/config/product/fleet';
+import FleetUtils from '@shell/utils/fleet';
+import { FLEET } from '@shell/config/types';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+import FleetApplication from '@shell/models/fleet-application';
+
+export default class HelmOp extends FleetApplication {
+  applyDefaults() {
+    const spec = this.spec || {};
+    const meta = this.metadata || {};
+
+    meta.namespace = this.$rootGetters['workspace'];
+
+    spec.helm = spec.helm || {};
+
+    spec['correctDrift'] = { enabled: false };
+
+    set(this, 'spec', spec);
+    set(this, 'metadata', meta);
+  }
+
+  get _availableActions() {
+    const out = super._availableActions;
+
+    insertAt(out, 0, {
+      action:   'pause',
+      label:    this.t('fleet.helmOp.actions.pause.label'),
+      icon:     'icon icon-pause',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.paused
+    });
+
+    insertAt(out, 1, {
+      action:   'unpause',
+      label:    this.t('fleet.helmOp.actions.unpause.label'),
+      icon:     'icon icon-play',
+      bulkable: true,
+      enabled:  !!this.links.update && this.spec?.paused === true
+    });
+
+    insertAt(out, 2, {
+      action:   'enablePollingAction',
+      label:    this.t('fleet.helmOp.actions.enablePolling.label'),
+      icon:     'icon icon-endpoints_connected',
+      bulkable: true,
+      enabled:  !!this.links.update && !!this.spec?.disablePolling
+    });
+
+    insertAt(out, 3, {
+      action:   'disablePollingAction',
+      label:    this.t('fleet.helmOp.actions.disablePolling.label'),
+      icon:     'icon icon-endpoints_disconnected',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.disablePolling
+    });
+
+    insertAt(out, 4, {
+      action:     'forceUpdate',
+      label:      this.t('fleet.helmOp.actions.forceUpdate.label'),
+      icon:       'icon icon-refresh',
+      bulkable:   true,
+      bulkAction: 'forceUpdateBulk',
+      enabled:    !!this.links.update
+    });
+
+    insertAt(out, 5, { divider: true });
+
+    return out;
+  }
+
+  forceUpdate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { helmOps: resources },
+      component:      'HelmOpForceUpdateDialog'
+    });
+  }
+
+  forceUpdateBulk(resources) {
+    this.$dispatch('promptModal', {
+      componentProps: { helmOps: resources },
+      component:      'HelmOpForceUpdateDialog'
+    });
+  }
+
+  get dashboardIcon() {
+    return FleetUtils.dashboardIcons[FLEET.HELM_OP];
+  }
+
+  get resourceIcon() {
+    return FleetUtils.resourceIcons[FLEET.HELM_OP];
+  }
+
+  github(value) {
+    const url = (value || '');
+
+    const matchHttps = url.match(FleetUtils.GIT_HTTPS_REGEX);
+
+    if (matchHttps) {
+      return matchHttps[1];
+    }
+
+    const matchSSH = url.match(FleetUtils.GIT_SSH_REGEX);
+
+    if (matchSSH) {
+      return FleetUtils.parseSSHUrl(matchSSH[0]).repoPath;
+    }
+
+    return false;
+  }
+
+  repoDisplay(repo) {
+    if (!repo) {
+      return null;
+    }
+
+    const github = this.github(repo);
+
+    if (github) {
+      return github;
+    }
+
+    repo = repo.replace(/.git$/, '');
+    repo = repo.replace(/^https:\/\//, '');
+    repo = repo.replace(/^oci:\/\//, '');
+    repo = repo.replace(/\/+$/, '');
+
+    return repo;
+  }
+
+  /**
+   *  Source type examples:
+   *
+   *  tarball:
+   *    chart: https://github.com/rancher/fleet-helm-charts/releases/download/fleet-0.12.1-beta.2/fleet-0.12.1-beta.2.tgz
+   *  repo:
+   *    repo: https://rancher.github.io/fleet-helm-charts/
+   *    chart: fleet-agent
+   *    version: 0.12.1-beta.2
+   *  oci:
+   *    chart: oci://ghcr.io/rancher/fleet-test-configmap-chart
+   *    version: the-tag
+   */
+  get sourceType() {
+    if (this.spec.helm?.repo && this.spec.helm?.chart) {
+      return SOURCE_TYPE.REPO;
+    }
+
+    if (this.spec.helm?.chart?.startsWith('oci://')) {
+      return SOURCE_TYPE.OCI;
+    }
+
+    if (this.spec.helm?.chart) {
+      return SOURCE_TYPE.TARBALL;
+    }
+
+    return null;
+  }
+
+  get source() {
+    let value = '';
+
+    switch (this.sourceType) {
+    case SOURCE_TYPE.REPO:
+      value = this.spec.helm?.repo || '';
+      break;
+    case SOURCE_TYPE.OCI: {
+      const parsed = parse(this.spec.helm?.chart || '');
+
+      value = parsed?.host ? `oci://${ parsed?.host }` : '';
+      break;
+    }
+    case SOURCE_TYPE.TARBALL:
+      value = this.spec.helm?.chart || ''; // TODO ellipsis and tooltip
+    }
+
+    const matchHttps = value.match(FleetUtils.HTTP_REGEX);
+    const matchOCI = value.match(FleetUtils.OCI_REGEX);
+    const matchSSH = value.match(FleetUtils.GIT_SSH_REGEX);
+
+    if (matchSSH) {
+      const { sshUserAndHost, repoPath } = FleetUtils.parseSSHUrl(matchSSH[0]);
+
+      value = `https://${ sshUserAndHost.replace('git@', '') }/${ repoPath }`;
+    }
+
+    return {
+      value,
+      display:  this.repoDisplay(value),
+      icon:     'icon icon-application',
+      showLink: matchHttps || matchSSH || matchOCI
+    };
+  }
+
+  get sourceSub() {
+    let chart = '';
+    const version = this.spec.helm.version || '';
+
+    switch (this.sourceType) {
+    case SOURCE_TYPE.REPO:
+      chart = this.spec.helm.chart || '';
+      break;
+    case SOURCE_TYPE.OCI: {
+      const parsed = parse(this.spec.helm.chart || '');
+
+      chart = parsed?.path ? parsed?.path.substring(1) : '';
+      break;
+    }
+    }
+
+    const value = chart && version ? chart.concat(':', version) : chart;
+
+    return {
+      value,
+      display: value,
+    };
+  }
+
+  get bundles() {
+    return this.$getters['matching'](FLEET.BUNDLE, { [FLEET_ANNOTATIONS.HELM_NAME]: this.name }, this.namespace);
+  }
+
+  get bundleDeployments() {
+    return this.$getters['matching'](FLEET.BUNDLE_DEPLOYMENT, { [FLEET_ANNOTATIONS.HELM_NAME]: this.name });
+  }
+}

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

@@ -16,6 +16,7 @@ export const configType = {
   github:          'oauth',
   keycloakoidc:    'oidc',
   genericoidc:     'oidc',
+  cognito:         'oidc',
 };
 
 const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };

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

@@ -106,10 +106,6 @@ export default class MgmtCluster extends SteveModel {
     return null;
   }
 
-  get rkeTemplateVersion() {
-    return this.spec?.clusterTemplateRevisionName;
-  }
-
   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;
@@ -136,14 +132,6 @@ export default class MgmtCluster extends SteveModel {
   }
 
   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
@@ -153,10 +141,6 @@ export default class MgmtCluster extends SteveModel {
       qp['provider'] = provider;
     }
 
-    if (clusterTemplateRevision) {
-      qp['clusterTemplateRevision'] = clusterTemplateRevision;
-    }
-
     // Copied out of https://github.com/rancher/ui/blob/20f56dc54c4fc09b5f911e533cb751c13609adaf/app/models/cluster.js#L844
     if ( provider === 'import' && isEmpty(this.eksConfig) && isEmpty(this.gkeConfig) ) {
       qp.importProvider = 'other';
@@ -168,10 +152,6 @@ export default class MgmtCluster extends SteveModel {
       qp.importProvider = KONTAINER_TO_DRIVER[provider];
     }
 
-    if ( this.clusterTemplateRevisionId ) {
-      qp.clusterTemplateRevision = this.clusterTemplateRevisionId;
-    }
-
     const path = addParams(`/c/${ escape(this.id) }/edit`, qp);
 
     return path;

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

@@ -1,6 +1,7 @@
 import { COUNT, FLEET, NORMAN } from '@shell/config/types';
 import { filterBy } from '@shell/utils/array';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 export default class Workspace extends HybridModel {
   get isLocal() {
@@ -41,6 +42,13 @@ export default class Workspace extends HybridModel {
     return forWorkspace;
   }
 
+  get helmOps() {
+    const all = this.$getters['all'](FLEET.HELM_OP);
+    const forWorkspace = filterBy(all, 'namespace', this.id);
+
+    return forWorkspace;
+  }
+
   get basicNorman() {
     if (this.id) {
       return this.$dispatch(`rancher/find`, { id: this.id, type: NORMAN.FLEET_WORKSPACES }, { root: true });
@@ -87,4 +95,8 @@ export default class Workspace extends HybridModel {
   get confirmRemove() {
     return true;
   }
+
+  get systemAnnotations() {
+    return [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT];
+  }
 }

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

@@ -4,37 +4,22 @@ import {
 } 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';
 import { downloadUrl } from '@shell/utils/download';
 import findLast from 'lodash/findLast';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'goToViewYaml',
+  'download',
+  'viewInApi'
+];
+
 export default class MgmtNode extends HybridModel {
   get _availableActions() {
     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'),
-    };
-
-    const scaleDown = {
-      action:     'scaleDown',
-      bulkAction: 'scaleDown',
-      enabled:    !!this.canScaleDown,
-      icon:       'icon icon-minus icon-fw',
-      label:      this.t('node.actions.scaleDown'),
-      bulkable:   true,
-    };
-
-    insertAt(out, 0, { divider: true });
-    insertAt(out, 0, downloadKeys);
-    insertAt(out, 0, scaleDown);
-
-    return out;
+    return out.filter((a) => a.divider || RKE1_ALLOWED_ACTIONS.includes(a.action));
   }
 
   get kubeNodeName() {

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

@@ -3,7 +3,19 @@ import { sortBy } from '@shell/utils/sort';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'goToViewYaml',
+  'download',
+  'viewInApi'
+];
+
 export default class MgmtNodePool extends HybridModel {
+  get _availableActions() {
+    const out = super._availableActions;
+
+    return out.filter((a) => a.divider || RKE1_ALLOWED_ACTIONS.includes(a.action));
+  }
+
   get nodeTemplateId() {
     return (this.spec?.nodeTemplateName || '').replace(/:/, '/');
   }

package/models/namespace.js

@@ -11,6 +11,11 @@ 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';
 
+/**
+ * obscure namespaces are reserved and have special meaning if they're also classed as `system`
+ *
+ * (by default hidden from user given by default `show dynamic namespaces` preference is disabled and `user namespaces` filter is on)
+ */
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
 

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

@@ -12,6 +12,14 @@ import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
 import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'openShell',
+  'downloadKubeConfig',
+  'copyKubeConfig',
+  'download',
+  'viewInApi'
+];
+
 /**
  * Class representing Cluster resource.
  * @extends SteveModel
@@ -41,17 +49,6 @@ export default class ProvCluster extends SteveModel {
       },
     ].filter((x) => !!x.content);
 
-    // RKE Template details
-    const rkeTemplate = this.rkeTemplate;
-
-    if (rkeTemplate) {
-      out.push({
-        label:     this.t('cluster.detail.rkeTemplate'),
-        formatter: 'RKETemplateName',
-        content:   rkeTemplate,
-      });
-    }
-
     if (!this.machineProvider) {
       out.splice(1, 1);
 
@@ -105,17 +102,6 @@ export default class ProvCluster extends SteveModel {
 
     const canSnapshot = ready && ((this.isRke2 && this.canUpdate) || (this.isRke1 && this.mgmt?.hasAction('backupEtcd')));
 
-    const clusterTemplatesSchema = this.$getters['schemaFor']('management.cattle.io.clustertemplate');
-    let canUpdateClusterTemplate = false;
-
-    if (clusterTemplatesSchema && (clusterTemplatesSchema.resourceMethods?.includes('blocked-PUT') || clusterTemplatesSchema.resourceMethods?.includes('PUT'))) {
-      canUpdateClusterTemplate = true;
-    }
-
-    const normanClusterSaveTemplateAction = !!this.normanCluster?.actions?.saveAsTemplate;
-
-    const canSaveRKETemplate = this.isRke1 && this.mgmt?.status?.driver === 'rancherKubernetesEngine' && !this.mgmt?.spec?.clusterTemplateName && this.hasLink('update') && canUpdateClusterTemplate && normanClusterSaveTemplateAction;
-
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
       // available actions for RKE1 clusters, but not RKE2 clusters.
@@ -158,12 +144,7 @@ export default class ProvCluster extends SteveModel {
         action:  'rotateEncryptionKey',
         label:   this.$rootGetters['i18n/t']('nav.rotateEncryptionKeys'),
         icon:    'icon icon-refresh',
-        enabled: canEditRKE2cluster || (this.isRke1 && this.mgmt?.hasAction('rotateEncryptionKey') && ready)
-      }, {
-        action:  'saveAsRKETemplate',
-        label:   this.$rootGetters['i18n/t']('nav.saveAsRKETemplate'),
-        icon:    'icon icon-folder',
-        enabled: canSaveRKETemplate,
+        enabled: canEditRKE2cluster
       }, { divider: true }];
 
     // Harvester Cluster 1:1 Harvester Cloud Cred
@@ -190,6 +171,15 @@ export default class ProvCluster extends SteveModel {
       }
     }
 
+    // If RKE1, then remove most of the actions
+    if (this.isRke1) {
+      all.forEach((action) => {
+        if (!action.divider && !RKE1_ALLOWED_ACTIONS.includes(action.action)) {
+          action.enabled = false;
+        }
+      });
+    }
+
     // If we have a helper that wants to modify the available actions, let it do it
     if (this.customProvisionerHelper?.availableActions) {
       // Provider can either modify the provided list or return one of its own
@@ -813,13 +803,6 @@ export default class ProvCluster extends SteveModel {
     this.$dispatch('promptRestore', [resource]);
   }
 
-  saveAsRKETemplate(cluster = this) {
-    this.$dispatch('promptModal', {
-      componentProps: { cluster },
-      component:      'SaveAsRKETemplateDialog'
-    });
-  }
-
   rotateCertificates(cluster = this) {
     this.$dispatch('promptModal', {
       componentProps: { cluster },
@@ -861,40 +844,11 @@ export default class ProvCluster extends SteveModel {
 
     return {
       displayName: `${ template.spec?.displayName }/${ revision.spec?.displayName }`,
-      upgrade:     this.rkeTemplateUpgrade,
       template,
       revision,
     };
   }
 
-  get rkeTemplateUpgrade() {
-    if (!this.isRke1 || !this.mgmt) {
-      // Not an RKE! cluster or no management cluster available
-      return false;
-    }
-
-    if (!this.mgmt.spec?.clusterTemplateRevisionName) {
-      // Cluster does not use an RKE template
-      return false;
-    }
-
-    const clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
-
-    // Get all of the template revisions for this template
-    const revisions = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).filter((t) => t.spec.enabled && t.spec.clusterTemplateName === this.mgmt.spec.clusterTemplateName);
-
-    if (revisions.length <= 1) {
-      // Only one template revision
-      return false;
-    }
-
-    revisions.sort((a, b) => {
-      return parseInt(a.metadata.resourceVersion, 10) - parseInt(b.metadata.resourceVersion, 10);
-    }).reverse();
-
-    return revisions[0].id !== clusterTemplateRevisionName ? revisions[0].spec?.displayName : false;
-  }
-
   get _stateObj() {
     if (!this.isRke2) {
       return this.mgmt?.stateObj || this.metadata?.state;

package/models/service.js

@@ -1,6 +1,7 @@
 import find from 'lodash/find';
 import { POD } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { parse } from '@shell/utils/selector';
 
 // i18n-uses servicesPage.serviceTypes.clusterIp.*, servicesPage.serviceTypes.externalName.*, servicesPage.serviceTypes.headless.*
 // i18n-uses servicesPage.serviceTypes.loadBalancer.*, servicesPage.serviceTypes.nodePort.*
@@ -49,7 +50,7 @@ export const CLUSTERIP = (() => {
   return clusterIp.id;
 })();
 
-export default class extends SteveModel {
+export default class Service extends SteveModel {
   get customValidationRules() {
     return [
       {
@@ -137,18 +138,32 @@ export default class extends SteveModel {
   }
 
   async fetchPods() {
-    if (this.podRelationship) {
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-      await this.$dispatch('cluster/findMatching', {
-        type:      POD,
-        selector:  this.podRelationship.selector,
-        namespace: this.namespace
-      }, { root: true });
+    if (!this.podRelationship) {
+      // If empty or not present, the service is assumed to have an external process managing its endpoints
+      return [];
     }
+
+    return await this.$dispatch('findLabelSelector', {
+      type:     POD,
+      matching: {
+        namespace:     this.metadata.namespace,
+        labelSelector: { matchExpressions: parse(this.podRelationship?.selector) },
+      }
+    });
   }
 
+  /**
+   * This getter expects a superset of workload pods to have been fetched already
+   *
+   * It assumes fetchPods has been called and should be used instead of the response of fetchPods
+   * (findAll --> findLabelSelector world results won't trigger change detection)
+   */
   get pods() {
-    return this.podRelationship ? this.$getters.matching( POD, this.podRelationship.selector, this.namespace ) : [];
+    if (this.podRelationship?.selector) {
+      return this.$getters['matchingLabelSelector'](POD, { matchExpressions: parse(this.podRelationship?.selector) }, this.metadata.namespace);
+    } else {
+      return [];
+    }
   }
 
   get serviceType() {