dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

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

@@ -12,6 +12,15 @@ 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 = [
+  'promptRemove',
+  'openShell',
+  'downloadKubeConfig',
+  'copyKubeConfig',
+  'download',
+  'viewInApi'
+];
+
 /**
  * Class representing Cluster resource.
  * @extends SteveModel
@@ -41,17 +50,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);
 
@@ -87,6 +85,15 @@ export default class ProvCluster extends SteveModel {
     };
   }
 
+  get canEdit() {
+    // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
+    if (this.isKev1 || this.isHarvester) {
+      return false;
+    }
+
+    return super.canEdit;
+  }
+
   get _availableActions() {
     const out = super._availableActions;
     const isLocal = this.mgmt?.isLocal;
@@ -103,41 +110,31 @@ export default class ProvCluster extends SteveModel {
 
     const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate;
 
-    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 canSnapshot = ready && this.isRke2 && this.canUpdate;
 
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
       // available actions for RKE1 clusters, but not RKE2 clusters.
+      // {
+      //   action:  'openShell',
+      //   label:   this.$rootGetters['i18n/t']('nav.shell'),
+      //   icon:    'icon icon-terminal',
+      //   enabled: !!this.mgmt?.links.shell && ready,
+      // }, {
+      //   action:     'downloadKubeConfig',
+      //   bulkAction: 'downloadKubeConfigBulk',
+      //   label:      this.$rootGetters['i18n/t']('nav.kubeconfig.download'),
+      //   icon:       'icon icon-download',
+      //   bulkable:   true,
+      //   enabled:    this.mgmt?.hasAction('generateKubeconfig'),
+      // }, {
+      //   action:   'copyKubeConfig',
+      //   label:    this.t('cluster.copyConfig'),
+      //   bulkable: false,
+      //   enabled:  this.mgmt?.hasAction('generateKubeconfig'),
+      //   icon:     'icon icon-copy',
+      // },
       {
-        action:  'openShell',
-        label:   this.$rootGetters['i18n/t']('nav.shell'),
-        icon:    'icon icon-terminal',
-        enabled: !!this.mgmt?.links.shell && ready,
-      }, {
-        action:     'downloadKubeConfig',
-        bulkAction: 'downloadKubeConfigBulk',
-        label:      this.$rootGetters['i18n/t']('nav.kubeconfig.download'),
-        icon:       'icon icon-download',
-        bulkable:   true,
-        enabled:    this.mgmt?.hasAction('generateKubeconfig'),
-      }, {
-        action:   'copyKubeConfig',
-        label:    this.t('cluster.copyConfig'),
-        bulkable: false,
-        enabled:  this.mgmt?.hasAction('generateKubeconfig'),
-        icon:     'icon icon-copy',
-      }, {
         action:     'snapshotAction',
         label:      this.$rootGetters['i18n/t']('nav.takeSnapshot'),
         icon:       'icon icon-snapshot',
@@ -158,12 +155,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
@@ -181,8 +173,8 @@ export default class ProvCluster extends SteveModel {
 
     const all = actions.concat(out);
 
-    // If the cluster is a KEV1 cluster then prevent edit
-    if (this.isKev1) {
+    // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
+    if (this.isKev1 || this.isHarvester) {
       const edit = all.find((action) => action.action === 'goToEdit');
 
       if (edit) {
@@ -190,6 +182,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
@@ -729,7 +730,7 @@ export default class ProvCluster extends SteveModel {
   async copyKubeConfig() {
     await this.mgmt?.copyKubeConfig();
 
-    this.$dispatch('growl/success', {
+    this.$dispatch('growl/info', {
       title:   this.t('cluster.copiedConfig'),
       timeout: 3000,
     }, { root: true });
@@ -746,7 +747,7 @@ export default class ProvCluster extends SteveModel {
   async snapshotAction() {
     try {
       await this.takeSnapshot();
-      this.$dispatch('growl/success', {
+      this.$dispatch('growl/info', {
         title:   this.$rootGetters['i18n/t']('cluster.snapshot.successTitle', { name: this.nameDisplay }),
         message: this.$rootGetters['i18n/t']('cluster.snapshot.successMessage', { name: this.nameDisplay })
       }, { root: true });
@@ -766,7 +767,7 @@ export default class ProvCluster extends SteveModel {
     const successful = res.filter( (x) => x.status === 'fulfilled').length;
 
     if ( successful ) {
-      this.$dispatch('growl/success', {
+      this.$dispatch('growl/info', {
         title:   this.$rootGetters['i18n/t']('cluster.snapshot.bulkSuccessTitle'),
         message: this.$rootGetters['i18n/t']('cluster.snapshot.bulkSuccessMessage', { count: successful })
       }, { root: true });
@@ -813,13 +814,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 },
@@ -839,62 +833,6 @@ export default class ProvCluster extends SteveModel {
     return this._stateObj;
   }
 
-  get rkeTemplate() {
-    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 clusterTemplateName = this.mgmt.spec.clusterTemplateName.replace(':', '/');
-    const clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
-    const template = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE).find((t) => t.id === clusterTemplateName);
-    const revision = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).find((t) => t.spec.enabled && t.id === clusterTemplateRevisionName);
-
-    if (!template || !revision) {
-      return false;
-    }
-
-    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;
@@ -1057,6 +995,28 @@ export default class ProvCluster extends SteveModel {
     return null;
   }
 
+  /**
+   * Gets the options for fields that should be commented out in the YAML representation
+   * of the model. This is particularly useful for conditionally commenting out certain
+   * fields based on the model's configuration.
+   *
+   * @returns {null | Array.<{path: string, key: string}>}
+   * - `path`: A dot-separated string indicating the path to the object containing the key.
+   * - `key`: The specific key within the object at the given path that should be commented out.
+   */
+  get commentFieldsOptions() {
+    if ( this.isRke2 ) {
+      return [
+        {
+          path: 'spec.rkeConfig.machineGlobalConfig',
+          key:  'profile'
+        }
+      ];
+    }
+
+    return null;
+  }
+
   // JSON Paths that should be folded in the YAML editor by default
   get yamlFolding() {
     return [
@@ -1088,4 +1048,8 @@ export default class ProvCluster extends SteveModel {
 
     return expireData?.expired || expireData?.expiring;
   }
+
+  get disableResourceDetailDrawerConfigTab() {
+    return !!this.isHarvester;
+  }
 }

package/models/secret.js

@@ -1,8 +1,8 @@
 import r from 'jsrsasign';
-import { CERTMANAGER, KUBERNETES } from '@shell/config/labels-annotations';
+import { CERTMANAGER, KUBERNETES, UI_PROJECT_SECRET, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import { removeObjects } from '@shell/utils/array';
-import { SERVICE_ACCOUNT } from '@shell/config/types';
+import { MANAGEMENT, SERVICE_ACCOUNT, VIRTUAL_TYPES } from '@shell/config/types';
 import { set } from '@shell/utils/object';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -10,6 +10,8 @@ import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboa
 import { diffFrom } from '@shell/utils/time';
 import day from 'dayjs';
 import { steveCleanForDownload } from '@shell/plugins/steve/resource-utils';
+import { STORE } from '@shell/store/store-types';
+import { escapeHtml } from '@shell/utils/string';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -159,6 +161,10 @@ export default class Secret extends SteveModel {
   }
 
   get canUpdate() {
+    if (this.isProjectSecretCopy) {
+      return false;
+    }
+
     if ( !this.hasLink('update') ) {
       return false;
     }
@@ -170,6 +176,20 @@ export default class Secret extends SteveModel {
     return this.$rootGetters['type-map/optionsFor'](this.type).isEditable;
   }
 
+  get canDelete() {
+    // Deleting a copy / synced secret that was created in a namespace in a project that has a project scoped secret
+    // will only be temporary (the parent project scoped secret will recreate it)
+    return this.isProjectSecretCopy ? false : super.canDelete;
+  }
+
+  get canCreate() {
+    return this.isProjectSecretCopy ? false : super.canCreate;
+  }
+
+  get canEditYaml() {
+    return this.isProjectSecretCopy ? false : super.canEditYaml;
+  }
+
   get keysDisplay() {
     const keys = [
       ...Object.keys(this.data || []),
@@ -470,4 +490,139 @@ export default class Secret extends SteveModel {
 
     return steveCleanForDownload(yaml, { rootKeys: ['id', 'links', 'actions'] });
   }
+
+  /**
+   * is this a project scoped secret .... or also a cloned project scoped secret
+   */
+  get isProjectScopedRelated() {
+    return !!this.metadata.labels?.[UI_PROJECT_SECRET];
+  }
+
+  /**
+   * is this a project scoped secret
+   */
+  get isProjectScoped() {
+    return this.isProjectScopedRelated && !this.isProjectSecretCopy && this.$rootGetters['isRancher'];
+  }
+
+  get projectScopedClusterId() {
+    if (!this.projectScopedProjectId) {
+      return undefined;
+    }
+
+    const clusterId = this.metadata.namespace.replace(`-${ this.projectScopedProjectId }`, '');
+
+    // default and system pss don't follow the patter of <cluster>-<project>, so if they match assume its one of them
+    return clusterId === this.metadata.namespace ? 'local' : clusterId;
+  }
+
+  get projectScopedProjectId() {
+    return this.metadata.labels?.[UI_PROJECT_SECRET];
+  }
+
+  get isProjectSecretCopy() {
+    return this.metadata?.annotations?.[UI_PROJECT_SECRET_COPY] === 'true';
+  }
+
+  get projectCluster() {
+    if (!this.isProjectScoped) {
+      return undefined;
+    }
+
+    return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.CLUSTER, this.projectScopedClusterId);
+  }
+
+  /**
+   * If this is a project scoped secret, return it
+   */
+  get project() {
+    if (!this.isProjectScoped ) {
+      return undefined;
+    }
+
+    return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ this.projectScopedClusterId }/${ this.projectScopedProjectId }`);
+  }
+
+  get projectScopedSecretCluster() {
+    if (!this.isProjectScoped ) {
+      return undefined;
+    }
+
+    return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ this.projectScopedClusterId }/${ this.projectScopedProjectId }`);
+  }
+
+  get clusterAndProjectLabel() {
+    if (!this.isProjectScoped) {
+      return '';
+    }
+    const clusterName = this.projectCluster?.nameDisplay;
+    // project is going to be empty if upstream and trying to show pss from downstream clusters
+    // we only ever have the current clusters projects. if we change this (fetch them in the list)
+    // we wipe out the header ns filter projects
+    const projectName = this.project?.nameDisplay || this.projectScopedProjectId;
+
+    if (clusterName && projectName) {
+      return `${ projectName } (${ clusterName })`;
+    }
+
+    return '';
+  }
+
+  get detailLocation() {
+    if (this.isProjectScoped) {
+      const id = this.id?.replace(/.*\//, '');
+
+      return {
+        name:   `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
+        params: {
+          product:   this.$rootGetters['productId'],
+          cluster:   this.$rootGetters['clusterId'],
+          namespace: this.metadata?.namespace,
+          resource:  VIRTUAL_TYPES.PROJECT_SECRETS,
+          id,
+        }
+      };
+    }
+
+    return this._detailLocation;
+  }
+
+  get listLocation() {
+    if (!this.isProjectScoped) {
+      return super.listLocation;
+    }
+
+    return {
+      name:   'c-cluster-product-resource',
+      params: {
+        product:  this.$rootGetters['productId'],
+        cluster:  this.$rootGetters['clusterId'],
+        resource: VIRTUAL_TYPES.PROJECT_SECRETS,
+      }
+    };
+  }
+
+  get parentNameOverride() {
+    if (!this.isProjectScoped) {
+      return super.parentNameOverride;
+    }
+
+    return this.$rootGetters['i18n/t'](`typeLabel."${ VIRTUAL_TYPES.PROJECT_SECRETS }"`, { count: 1 })?.trim();
+  }
+
+  get parentLocationOverride() {
+    if (!this.isProjectScoped) {
+      return super.parentNameOverride;
+    }
+
+    return this.listLocation;
+  }
+
+  get groupByProject() {
+    if (!this.isProjectScoped) {
+      return undefined;
+    }
+
+    return this.t('resourceTable.groupLabel.project', { name: escapeHtml(this?.project?.nameDisplay || '') }, true);
+  }
 }

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,36 @@ 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) },
+      }
+    });
   }
 
+  async unWatchPods() {
+    return await this.$dispatch('unwatch', { type: POD, all: true });
+  }
+
+  /**
+   * 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() {

package/models/storage.k8s.io.storageclass.js

@@ -141,14 +141,14 @@ export default class extends SteveModel {
       out.unshift({
         action:  'resetDefault',
         enabled: true,
-        // icon:    'icon icon-fw icon-checkmark',
+        icon:    'icon icon-fw icon-checkmark',
         label:   this.t('storageClass.actions.resetDefault'),
       });
     } else {
       out.unshift({
         action:  'setDefault',
         enabled: true,
-        // icon:    'icon icon-fw icon-checkmark',
+        icon:    'icon icon-fw icon-checkmark',
         label:   this.t('storageClass.actions.setAsDefault'),
       });
     }