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

package/edit/provisioning.cattle.io.cluster/tabs/Basics.vue

@@ -3,7 +3,6 @@ import difference from 'lodash/difference';
 import { mapGetters } from 'vuex';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
-
 import { set, get } from '@shell/utils/object';
 import { Banner } from '@components/Banner';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -11,12 +10,11 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import YamlEditor from '@shell/components/YamlEditor';
 import { LEGACY } from '@shell/store/features';
 import semver from 'semver';
-import { _CREATE, _EDIT } from '@shell/config/query-params';
 
 const HARVESTER = 'harvester';
 
 export default {
-  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'cis-changed', 'psa-default-changed'],
+  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'compliance-changed', 'psa-default-changed'],
 
   components: {
     Banner,
@@ -53,7 +51,7 @@ export default {
       type:     Object,
       required: true
     },
-    cisOverride: {
+    complianceOverride: {
       type:     Boolean,
       required: true
     },
@@ -119,12 +117,23 @@ export default {
     }
   },
 
+  data() {
+    return {
+      showEnablingComplianceWarning: false,
+      initialAgentProfile:           this.value.agentConfig?.profile || ''
+    };
+  },
+
   watch: {
     selectedVersion(neu, old) {
       if (neu?.value !== old?.value && this.ciliumIpv6) {
         // Re-assign so that the setter updates the structure for the new k8s version if needed
         this.ciliumIpv6 = !!this.ciliumIpv6;
       }
+    },
+
+    'agentConfig.profile'(newValue) {
+      this.showEnablingComplianceWarning = this.provider === 'custom' && this.isEdit && !!newValue && newValue !== this.initialAgentProfile;
     }
   },
 
@@ -157,7 +166,7 @@ export default {
       });
 
       out.unshift({
-        label: this.$store.getters['i18n/t']('cluster.rke2.cisProfile.option'),
+        label: this.$store.getters['i18n/t']('cluster.rke2.complianceProfile.option'),
         value: ''
       });
 
@@ -167,19 +176,19 @@ export default {
     /**
      * Allow to display override if PSA is needed and profile is set
      */
-    hasCisOverride() {
+    hasComplianceOverride() {
       return (this.serverConfig?.profile || this.agentConfig?.profile) &&
         // Also check other cases on when to display the override
-        this.showCisProfile && this.isCisSupported;
+        this.showComplianceProfile && this.isComplianceSupported;
     },
 
     /**
-     * Disable PSA if CIS hardening is enabled, except override
+     * Disable PSA if Compliance hardening is enabled, except override
      */
     isPsaDisabled() {
-      const cisValue = this.agentConfig?.profile || this.serverConfig?.profile;
+      const complianceValue = this.agentConfig?.profile || this.serverConfig?.profile;
 
-      return !(!cisValue || this.cisOverride) && this.isCisSupported;
+      return !(!complianceValue || this.complianceOverride) && this.isComplianceSupported;
     },
 
     /**
@@ -218,12 +227,12 @@ export default {
     },
 
     /**
-     * Check if current CIS profile is required and listed in the options
+     * Check if current compliance profile is required and listed in the options
      */
-    isCisSupported() {
-      const cisProfile = this.serverConfig?.profile || this.agentConfig?.profile;
+    isComplianceSupported() {
+      const complianceProfile = this.serverConfig?.profile || this.agentConfig?.profile;
 
-      return !cisProfile || this.profileOptions.map((option) => option.value).includes(cisProfile);
+      return !complianceProfile || this.profileOptions.map((option) => option.value).includes(complianceProfile);
     },
 
     disableOptions() {
@@ -252,7 +261,7 @@ export default {
       return this.selectedVersion?.charts || {};
     },
 
-    showCisProfile() {
+    showComplianceProfile() {
       return (this.provider === 'custom' || this.isElementalCluster) && ( this.serverArgs?.profile || this.agentArgs?.profile );
     },
 
@@ -382,10 +391,6 @@ export default {
       }
     },
 
-    isEdit() {
-      return this.mode === _EDIT;
-    },
-
     canNotEditCloudProvider() {
       if (!this.isEdit) {
         return false;
@@ -405,14 +410,14 @@ export default {
      * Display warning about unsupported Azure provider if k8s >= 1.30
      */
     showCloudProviderUnsupportedAzureWarning() {
-      return this.showCloudProvider && this.mode === _CREATE && this.isAzureProviderUnsupported;
+      return this.showCloudProvider && this.isCreate && this.isAzureProviderUnsupported;
     },
 
     /**
      * Display warning about Azure provider migration from k8s versions >= 1.27 to External provider
      */
     showCloudProviderMigrateAzureWarning() {
-      return this.showCloudProvider && this.mode === _EDIT && this.canAzureMigrateOnEdit;
+      return this.showCloudProvider && this.isEdit && this.canAzureMigrateOnEdit;
     }
   },
 
@@ -573,52 +578,56 @@ export default {
     </h3>
 
     <Banner
-      v-if="showCisProfile && !isCisSupported && isEdit"
+      v-if="showComplianceProfile && !isComplianceSupported && isEdit"
       color="info"
     >
-      <p v-clean-html="t('cluster.rke2.banner.cisUnsupported', {cisProfile: serverConfig.profile || agentConfig.profile}, true)" />
+      <p v-clean-html="t('cluster.rke2.banner.complianceUnsupported', {profile: serverConfig.profile || agentConfig.profile}, true)" />
     </Banner>
 
-    <div class="row mb-10">
-      <div
-        v-if="showCisProfile"
-        class="col span-6"
-      >
+    <div v-if="showComplianceProfile">
+      <div class="col span-6">
         <LabeledSelect
           v-if="serverArgs && serverArgs.profile && serverConfig"
           v-model:value="serverConfig.profile"
           :mode="mode"
           :options="profileOptions"
-          :label="t('cluster.rke2.cis.sever')"
-          @update:value="$emit('cis-changed')"
+          :label="t('cluster.rke2.compliance.sever')"
+          @update:value="$emit('compliance-changed')"
         />
         <LabeledSelect
           v-else-if="agentArgs && agentArgs.profile && agentConfig"
           v-model:value="agentConfig.profile"
-          data-testid="rke2-custom-edit-cis-agent"
+          data-testid="rke2-custom-edit-compliance-agent"
           :mode="mode"
           :options="profileOptions"
-          :label="t('cluster.rke2.cis.agent')"
-          @update:value="$emit('cis-changed')"
+          :label="t('cluster.rke2.compliance.agent')"
+          @update:value="$emit('compliance-changed')"
+        />
+      </div>
+      <div class="row mb-10">
+        <Banner
+          v-if="showEnablingComplianceWarning"
+          color="warning"
+          label-key="cluster.rke2.compliance.warning"
         />
       </div>
     </div>
 
-    <template v-if="hasCisOverride">
+    <template v-if="hasComplianceOverride">
       <Checkbox
-        :value="cisOverride"
+        :value="complianceOverride"
         :mode="mode"
-        :label="t('cluster.rke2.cis.override')"
+        :label="t('cluster.rke2.compliance.override')"
         @update:value="$emit('psa-default-changed')"
       />
 
       <Banner
-        v-if="cisOverride"
+        v-if="complianceOverride"
         color="warning"
-        :label="t('cluster.rke2.banner.cisOverride')"
+        :label="t('cluster.rke2.banner.complianceOverride')"
       />
       <Banner
-        v-if="!cisOverride"
+        v-if="!complianceOverride"
         color="info"
         :label="t('cluster.rke2.banner.psaChange')"
       />
@@ -695,6 +704,6 @@ export default {
 
 <style lang="scss" scoped>
   .patch-version {
-    margin-top: 5px;
+    margin-top: 10px;
   }
 </style>

package/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue

@@ -78,8 +78,8 @@ export default {
           this.k8sDistroSubDir = DEFAULT_SUBDIRS.K8S_DISTRO_RKE2;
         }
 
-        if (this.value.k8sDistro) {
-          this.value.k8sDistro = `${ neu }/${ this.k8sDistroSubDir }`;
+        if (this.dataConfigRadioValue === DATA_DIR_RADIO_OPTIONS.COMMON && this.commonConfig) {
+          this.value.k8sDistro = `${ this.commonConfig }/${ this.k8sDistroSubDir }`;
         }
       }
     }
@@ -129,9 +129,11 @@ export default {
         this.commonConfig = DEFAULT_COMMON_BASE_PATH;
 
         this.dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.COMMON;
+
+        // individual data for each field is set on the watcher for commonConfig a bit further above
         break;
-      // default is custom config
       default:
+        // switch "default" is for the "custom" config
         if (this.mode === _CREATE) {
           this.commonConfig = '';
         }

package/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue

@@ -45,6 +45,10 @@ export default {
       type:    String,
       default: null
     },
+    projectId: {
+      type:    String,
+      default: null
+    },
 
     mode: {
       type:    String,
@@ -306,6 +310,7 @@ export default {
       :value="value.config"
       :provider="provider"
       :credential-id="credentialId"
+      :project-id="projectId"
       :pool-index="idx"
       :pool-id="poolId"
       :pool-create-mode="value.create"

package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue

@@ -104,7 +104,7 @@ export default {
 
         configs[h] = {
           ...entry,
-          caBundle: base64Encode(entry.caBundle)
+          caBundle: entry.caBundle ? base64Encode(entry.caBundle) : null
         };
 
         delete configs[h].hostname;
@@ -172,7 +172,7 @@ export default {
               :mode="mode"
               generate-name="registryconfig-auth-"
               :data-testid="`registry-auth-select-or-create-${i}`"
-              :cache-secrets="true"
+              :cache-secrets="false"
               @update:value="update"
             />
           </div>

package/edit/resources.cattle.io.restore.vue

@@ -48,7 +48,7 @@ export default {
   async fetch() {
     const hash = await allHash({
       catalog:     this.$store.dispatch('catalog/load'),
-      resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set' }),
+      resourceSet: this.$store.dispatch('cluster/find', { type: BACKUP_RESTORE.RESOURCE_SET, id: this.value?.spec?.resourceSetName || 'rancher-resource-set-full' }),
       apps:        this.$store.dispatch('cluster/findAll', { type: CATALOG.APP })
     });
 

package/edit/secret/basic.vue

@@ -49,6 +49,7 @@ export default {
           required
           :label="t('secret.basic.username')"
           :mode="mode"
+          data-testid="secret-basic-username"
         />
       </div>
       <div class="col span-6">

package/edit/secret/index.vue

@@ -1,22 +1,23 @@
 <script>
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import { MANAGEMENT, NAMESPACE, DEFAULT_WORKSPACE } from '@shell/config/types';
+import {
+  SECRET_SCOPE, SECRET_QUERY_PARAMS,
+  CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
+} from '@shell/config/query-params';
+import { MANAGEMENT, NAMESPACE, DEFAULT_WORKSPACE, VIRTUAL_TYPES } from '@shell/config/types';
+import { CAPI, UI_PROJECT_SECRET } from '@shell/config/labels-annotations';
+import FormValidation from '@shell/mixins/form-validation';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import CruResource from '@shell/components/CruResource';
-import {
-  CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
-} from '@shell/config/query-params';
 import Loading from '@shell/components/Loading';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import Labels from '@shell/components/form/Labels';
 import { HIDE_SENSITIVE } from '@shell/store/prefs';
-import { CAPI } from '@shell/config/labels-annotations';
 import { clear, uniq } from '@shell/utils/array';
-import { NAME as MANAGER } from '@shell/config/product/manager';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
@@ -46,12 +47,34 @@ export default {
     SelectIconGrid
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
 
   async fetch() {
     if ( this.isCloud ) {
       this.nodeDrivers = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_DRIVER });
     }
+
+    const projectScopedLabel = this.value.metadata?.labels?.[UI_PROJECT_SECRET];
+    const isProjectScoped = !!projectScopedLabel || (this.isCreate && this.$route.query[SECRET_SCOPE] === SECRET_QUERY_PARAMS.PROJECT_SCOPED);
+
+    this.isProjectScoped = isProjectScoped;
+
+    if (isProjectScoped) {
+      // If ssp is enabled the store not have all projects. ensure we have them all
+      await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
+      if (this.isCreate) {
+        // Pick first project as default
+        this.projectName = this.filteredProjects[0].metadata.name;
+
+        this.value.metadata.labels = this.value.metadata.labels || {};
+
+        // Set namespace and project-scoped label
+        this.value.metadata.namespace = this.filteredProjects[0].status.backingNamespace;
+        this.value.metadata.labels[UI_PROJECT_SECRET] = this.filteredProjects[0].metadata.name;
+      } else {
+        this.projectName = this.filteredProjects.find((p) => p.metadata.name === projectScopedLabel).metadata.name;
+      }
+    }
   },
 
   data() {
@@ -89,14 +112,50 @@ export default {
 
     return {
       isCloud,
+      isProjectScoped:   false,
       nodeDrivers:       null,
       secretTypes,
       secretType:        this.value._type,
-      initialSecretType: this.value._type
+      initialSecretType: this.value._type,
+      projectName:       null,
+      fvFormRuleSets:    [
+        {
+          path:  'metadata.name',
+          rules: ['required'],
+        },
+        {
+          path:  'metadata.namespace',
+          rules: ['required'],
+        },
+      ],
     };
   },
 
   computed: {
+    clusterId() {
+      return this.$store.getters['currentCluster'].id;
+    },
+
+    filteredProjects() {
+      const allProjects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
+
+      return allProjects.filter((p) => p.spec?.clusterName === this.clusterId);
+    },
+
+    projectOpts() {
+      let projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
+
+      // Filter out projects not for the current cluster
+      projects = projects.filter((c) => c.spec?.clusterName === this.clusterId);
+      const out = projects.map((project) => {
+        return {
+          label: project.nameDisplay,
+          value: project.metadata.name,
+        };
+      });
+
+      return out;
+    },
     isCustomSecretCreate() {
       return this.mode === _CREATE && this.$route.query.type === 'custom';
     },
@@ -214,12 +273,15 @@ export default {
       }
     },
 
-    doneRoute() {
-      if ( this.$store.getters['currentProduct'].name === MANAGER ) {
-        return 'c-cluster-manager-secret';
-      } else {
-        return 'c-cluster-product-resource';
+    doneLocationOverride() {
+      if (this.isProjectScoped) {
+        return {
+          ...this.value.listLocation,
+          params: { resource: VIRTUAL_TYPES.PROJECT_SECRETS }
+        };
       }
+
+      return this.value.listLocation;
     },
   },
 
@@ -251,6 +313,13 @@ export default {
         }
       }
 
+      if (this.isProjectScoped) {
+        // Always create project-scoped secrets in the upstream local cluster
+        const url = this.$store.getters['management/urlFor'](this.value.type, this.value.id);
+
+        return this.save(btnCb, url);
+      }
+
       return this.save(btnCb);
     },
 
@@ -301,8 +370,25 @@ export default {
       if (type !== 'custom') {
         this.value['_type'] = type;
       }
+    },
+
+    redirectAfterCancel() {
+      this.$router.replace(this.doneLocationOverride);
     }
   },
+
+  watch: {
+    projectName(neu) {
+      if (this.isCreate && neu) {
+        this.value.metadata.labels = this.value.metadata.labels || {};
+        this.value.metadata.labels[UI_PROJECT_SECRET] = neu;
+
+        const projectScopedNamespace = this.filteredProjects.find((p) => p.metadata.name === neu).status.backingNamespace;
+
+        this.value.metadata.namespace = projectScopedNamespace;
+      }
+    }
+  }
 };
 </script>
 
@@ -312,28 +398,53 @@ export default {
     <CruResource
       v-else
       :mode="mode"
-      :validation-passed="true"
+      :validation-passed="fvFormIsValid"
       :selected-subtype="value._type"
       :resource="value"
       :errors="errors"
-      :done-route="doneRoute"
       :subtypes="secretSubTypes"
+      :cancel-event="true"
+      :done-route="doneLocationOverride"
       @finish="saveSecret"
       @select-type="selectType"
       @error="e=>errors = e"
+      @cancel="redirectAfterCancel"
     >
       <NameNsDescription
+        v-if="!isProjectScoped"
         :value="value"
         :mode="mode"
         :namespaced="!isCloud"
         @update:value="$emit('input', $event)"
       />
+      <NameNsDescription
+        v-else
+        :value="value"
+        :namespaced="false"
+        :mode="mode"
+        :rules="{
+          name: fvGetAndReportPathRules('metadata.name'),
+          namespace: fvGetAndReportPathRules('metadata.namespace'),
+        }"
+      >
+        <template #project-selector>
+          <LabeledSelect
+            v-model:value="projectName"
+            class="mr-20"
+            :disabled="!isCreate"
+            :label="t('namespace.project.label')"
+            :options="projectOpts"
+            required
+            data-testid="secret-project-select"
+          />
+        </template>
+      </NameNsDescription>
 
       <div
         v-if="isCustomSecretCreate"
         class="row"
       >
-        <div class="col span-3">
+        <div class="col span-6">
           <LabeledSelect
             v-model:value="secretType"
             :options="secretTypes"
@@ -347,7 +458,7 @@ export default {
           />
         </div>
 
-        <div class="col span-3">
+        <div class="col span-6">
           <LabeledInput
             v-if="showCustomSecretType"
             ref="customType"
@@ -373,6 +484,7 @@ export default {
       <Tabbed
         v-else
         :side-tabs="true"
+        :use-hash="useTabbedHash"
         default-tab="data"
       >
         <Tab

package/edit/service.vue

@@ -21,7 +21,7 @@ import Labels from '@shell/components/form/Labels';
 import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOnConfig';
 import { clone } from '@shell/utils/object';
 import { POD, CAPI, HCI } from '@shell/config/types';
-import { matching } from '@shell/utils/selector';
+import { matching } from '@shell/utils/selector-typed';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
@@ -98,7 +98,6 @@ export default {
 
     return {
       matchingPods,
-      allPods:                     [],
       defaultServiceTypes:         DEFAULT_SERVICE_TYPES,
       saving:                      false,
       sessionAffinityActionLabels: Object.values(SESSION_AFFINITY_ACTION_LABELS)
@@ -109,7 +108,8 @@ export default {
       ),
       fvFormRuleSets:            [],
       fvReportedValidationPaths: ['spec'],
-      closedErrorMessages:       []
+      closedErrorMessages:       [],
+      inStore:                   this.$store.getters['currentStore'](POD),
     };
   },
 
@@ -257,42 +257,27 @@ export default {
   },
 
   methods: {
-    updateMatchingPods: throttle(function() {
+    updateMatchingPods: throttle(async function() {
+      // https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/#ServiceSpec
       const { value: { spec: { selector = { } } } } = this;
-      const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
-
-      if (isEmpty(selector)) {
-        this.matchingPods = {
-          matched: 0,
-          total:   allInNamespace.length,
-          none:    true,
-          sample:  null,
-        };
-      } else {
-        const match = matching(allInNamespace, selector);
 
-        this.matchingPods = {
-          matched: match.length,
-          total:   allInNamespace.length,
-          none:    match.length === 0,
-          sample:  match[0] ? match[0].nameDisplay : null,
-        };
-      }
+      this.matchingPods = await matching({
+        labelSelector: { matchLabels: selector },
+        type:          POD,
+        $store:        this.$store,
+        inStore:       this.inStore,
+        namespace:     this.value?.metadata?.namespace,
+      });
     }, 250, { leading: true }),
 
     async loadPods() {
       try {
-        const inStore = this.$store.getters['currentStore'](POD);
-
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
-        const res = await allHash(hash);
-
-        this.allPods = res.pods;
+        await allHash(hash);
         this.updateMatchingPods();
       } catch (e) { }
     },
@@ -359,7 +344,10 @@ export default {
       :rules="{ name: fvGetAndReportPathRules('metadata.name'), namespace: [], description: [] }"
     />
 
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         v-if="checkTypeIs('ExternalName')"
         name="define-external-name"
@@ -432,7 +420,7 @@ export default {
       >
         <div
           v-if="hasClusterIp"
-          class="row mb-20"
+          class="row"
         >
           <div class="col span-6">
             <LabeledInput
@@ -497,6 +485,7 @@ export default {
         :tooltip="t('servicesPage.affinity.helpText')"
       >
         <div class="row session-affinity">
+          <div style="min-width: 160px;padding-top: 3px;">会话保持</div>
           <div class="col span-6">
             <RadioGroup
               v-model:value="value.spec.sessionAffinity"
@@ -507,6 +496,8 @@ export default {
               :mode="mode"
             />
           </div>
+        </div>
+        <div class="row">
           <div
             v-if="showAffinityTimeout"
             class="col span-6"

package/edit/serviceaccount.vue

@@ -142,7 +142,10 @@ export default {
       :mode="mode"
     />
 
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="data"
         :label="t('serviceAccount.tabs.serviceAccount.label')"