@rancher/shell 3.0.4 → 3.0.5-rc.2

package/edit/provisioning.cattle.io.cluster/SelectCredential.vue

@@ -81,6 +81,30 @@ export default {
   },
 
   computed: {
+    hasCustomCloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/hasCustomCloudCredentialComponent'](driverName);
+    },
+
+    cloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/importCloudCredential'](driverName);
+    },
+
+    genericCloudCredentialComponent() {
+      return this.$store.getters['type-map/importCloudCredential']('generic');
+    },
+
+    cloudComponent() {
+      if (this.hasCustomCloudCredentialComponent) {
+        return this.cloudCredentialComponent;
+      }
+
+      return this.genericCloudCredentialComponent;
+    },
+
     isNone() {
       return this.credentialId === null || this.credentialId === _NONE;
     },
@@ -140,14 +164,6 @@ export default {
       return out;
     },
 
-    createComponent() {
-      if (this.$store.getters['type-map/hasCustomCloudCredentialComponent'](this.driverName)) {
-        return this.$store.getters['type-map/importCloudCredential'](this.driverName);
-      }
-
-      return this.$store.getters['type-map/importCloudCredential']('generic');
-    },
-
     validationPassed() {
       if ( this.credentialId === _NONE ) {
         return false;
@@ -175,6 +191,7 @@ export default {
   },
 
   methods: {
+
     async save(btnCb) {
       if ( this.errors ) {
         clear(this.errors);
@@ -266,7 +283,7 @@ export default {
       />
 
       <component
-        :is="createComponent"
+        :is="cloudComponent"
         ref="create"
         v-model:value="newCredential"
         mode="create"

package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts

@@ -176,7 +176,7 @@ describe('component: Advanced', () => {
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
           const globalInputElem = globalContainer;
-          const selectorInputElem = selectorContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(globalInputElem.exists()).toBe(false);
           expect(selectorInputElem.value).toContain('config-from-machineSelectorConfig');
@@ -199,7 +199,7 @@ describe('component: Advanced', () => {
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
           const selectorInputElem = selectorContainer;
-          const globalInputElem = globalContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(selectorInputElem.exists()).toBe(false);
           expect(globalInputElem.value).toContain('config-from-machineGlobalConfig');
@@ -222,8 +222,8 @@ describe('component: Advanced', () => {
           const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-          const selectorInputElem = selectorContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
-          const globalInputElem = globalContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
+          const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(selectorInputElem.value).toContain('config-from-machineSelectorConfig');
           expect(globalInputElem.value).toContain('config-from-machineGlobalConfig');
@@ -247,8 +247,8 @@ describe('component: Advanced', () => {
         const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
         const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-        const selectorInputElem = selectorContainer.find('[data-testid="input-0"]');
-        const globalInputElem = globalContainer.find('[data-testid="input-0"]');
+        const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]');
+        const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]');
 
         const emptyCharacter = wrapper.find('.info-box').find('.text-muted').element;
 
@@ -282,8 +282,8 @@ describe('component: Advanced', () => {
         const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
         const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-        const selectorInputElem = selectorContainer.find('[data-testid="input-0"]');
-        const globalInputElem = globalContainer.find('[data-testid="input-0"]');
+        const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]');
+        const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]');
 
         const emptyCharacter = wrapper.find('.info-box').find('.text-muted');
 

package/edit/provisioning.cattle.io.cluster/__tests__/DirectoryConfig.test.ts

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 /* eslint-disable jest/no-hooks */
 import { mount, Wrapper } from '@vue/test-utils';
-import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
+import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS, DEFAULT_COMMON_BASE_PATH } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 
@@ -54,7 +54,7 @@ describe('component: DirectoryConfig', () => {
     expect(k8sDistroInput.exists()).toBe(false);
   });
 
-  it('updating common base directory should set the correct values on each data dir variable', async() => {
+  it('setting the radio option to "common" should set the correct values on each data dir variable', async() => {
     const newMountOptions = clone(mountOptions);
 
     wrapper = mount(
@@ -68,17 +68,12 @@ describe('component: DirectoryConfig', () => {
       }
     );
 
-    const inputPath = 'some-data-dir';
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
+    // update radio to the "common" option
+    await wrapper.vm.handleRadioInput(DATA_DIR_RADIO_OPTIONS.COMMON);
 
-    // update base dir value
-    expect(commonInput.exists()).toBe(true);
-    commonInput.setValue(inputPath);
-    await nextTick();
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
   });
 
   it('updating each individual data dir should set the correct values on each data dir variable', async() => {
@@ -179,4 +174,23 @@ describe('component: DirectoryConfig', () => {
     expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
     expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
   });
+
+  it('updating the k8s version for the "common" config should only update the sub dir for the k8sDistro value', async() => {
+    wrapper = mount(
+      DirectoryConfig,
+      mountOptions
+    );
+
+    // update radio to the "common" option
+    await wrapper.vm.handleRadioInput(DATA_DIR_RADIO_OPTIONS.COMMON);
+
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
+
+    // let's update the k8s version
+    await wrapper.setProps({ k8sVersion: 'v1.32.4+rke2r1' });
+
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_RKE2 }`);
+  });
 });

package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts

@@ -3,6 +3,7 @@ import { SECRET } from '@shell/config/types';
 import { _CREATE } from '@shell/config/query-params';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 import { get } from '@shell/utils/object';
+import { rke2TestTable } from './utils/rke2-test-data';
 
 /**
  * DISCLAIMER ***************************************************************************************
@@ -543,4 +544,69 @@ describe('component: rke2', () => {
 
     expect(azureOption.disabled).toBe(value);
   });
+
+  it.each(rke2TestTable)('should preserve valid user-supplied chart values', (chartValues, expected) => {
+    const wrapper = mount(rke2, {
+      props: {
+        mode:  _CREATE,
+        value: {
+          spec: {
+            ...defaultSpec,
+            chartValues,
+            kubernetesVersion: 'v1.32.3+rke2r1',
+            rkeConfig:         {
+              machineGlobalConfig: {
+                cni:                   'calico',
+                'disable-kube-proxy':  false,
+                'etcd-expose-metrics': false
+              },
+            }
+          },
+          agentConfig: { 'cloud-provider-name': 'any' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        credentialId:    'I am authenticated',
+        userChartValues: chartValues,
+        rke2Versions:    [
+          {
+            id:                      'v1.32.3+rke2r1',
+            type:                    'release',
+            links:                   { self: 'https://127.0.0.1:8005/v1-rke2-release/releases/v1.32.3+rke2r1' },
+            version:                 'v1.32.3+rke2r1',
+            minChannelServerVersion: 'v2.11.0-alpha1',
+            maxChannelServerVersion: 'v2.11.99',
+            serverArgs:              {},
+            agentArgs:               {},
+            featureVersions:         { 'encryption-key-rotation': '2.0.0' },
+            charts:                  {
+              'rke2-ingress-nginx': {
+                repo:    'rancher-rke2-charts',
+                version: '4.12.100'
+              },
+              'rke2-metrics-server': {
+                repo:    'rancher-rke2-charts',
+                version: '3.12.200'
+              },
+            }
+          }
+        ]
+      }),
+
+      global: {
+        mocks: {
+          ...defaultMocks,
+          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
+          $plugin: { getDynamic: jest.fn(() => undefined ) },
+        },
+
+        stubs: defaultStubs,
+      },
+    });
+
+    wrapper.vm.applyChartValues(wrapper.vm.value.spec.rkeConfig);
+
+    expect(wrapper.vm.value.spec.rkeConfig.chartValues).toStrictEqual(expected);
+  });
 });

package/edit/provisioning.cattle.io.cluster/__tests__/utils/rke2-test-data.ts

@@ -0,0 +1,58 @@
+export const rke2TestTable = [
+  [
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+  ],
+  [
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      },
+      'rke2-ingress-nginx-invalid': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+  ],
+];

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -22,10 +22,12 @@ import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { findBy, removeObject, clear } from '@shell/utils/array';
 import { createYaml } from '@shell/utils/create-yaml';
 import {
-  clone, diff, set, get, isEmpty, mergeWithReplaceArrays
+  clone, diff, set, get, isEmpty, mergeWithReplace
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
-import { getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
+import {
+  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization
+} from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -63,7 +65,6 @@ import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 import VsphereUtils, { VMWARE_VSPHERE } from '@shell/utils/v-sphere';
 import { mapGetters } from 'vuex';
-import { SCHEDULING_CUSTOMIZATION } from '@shell/store/features';
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 const NETBIOS_TRUNCATION_LENGTH = 15;
@@ -149,7 +150,13 @@ export default {
     await this.initSpecs();
     await this.initAddons();
     await this.initRegistry();
-    await this.initSchedulingCustomization();
+    const sc = await initSchedulingCustomization(this.value.spec, this.features, this.$store, this.mode);
+
+    this.clusterAgentDefaultPC = sc.clusterAgentDefaultPC;
+    this.clusterAgentDefaultPDB = sc.clusterAgentDefaultPDB;
+    this.schedulingCustomizationFeatureEnabled = sc.schedulingCustomizationFeatureEnabled;
+    this.schedulingCustomizationOriginallyEnabled = sc.schedulingCustomizationOriginallyEnabled;
+    this.errors = this.errors.concat(sc.errors);
 
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
@@ -243,20 +250,21 @@ export default {
       fvFormRuleSets:                  [{
         path: 'metadata.name', rules: ['subDomain'], translationKey: 'nameNsDescription.name.label'
       }],
-      harvesterVersionRange:                 {},
-      cisOverride:                           false,
+      harvesterVersionRange:                    {},
+      cisOverride:                              false,
       truncateLimit,
-      busy:                                  false,
-      machinePoolValidation:                 {}, // map of validation states for each machine pool
-      machinePoolErrors:                     {},
-      addonConfigValidation:                 {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
-      allNamespaces:                         [],
-      extensionTabs:                         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
-      clusterAgentDeploymentCustomization:   null,
-      schedulingCustomizationFeatureEnabled: false,
-      clusterAgentDefaultPC:                 null,
-      clusterAgentDefaultPDB:                null,
-      activeTab:                             null,
+      busy:                                     false,
+      machinePoolValidation:                    {}, // map of validation states for each machine pool
+      machinePoolErrors:                        {},
+      addonConfigValidation:                    {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
+      allNamespaces:                            [],
+      extensionTabs:                            getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      clusterAgentDeploymentCustomization:      null,
+      schedulingCustomizationFeatureEnabled:    false,
+      schedulingCustomizationOriginallyEnabled: false,
+      clusterAgentDefaultPC:                    null,
+      clusterAgentDefaultPDB:                   null,
+      activeTab:                                null,
       REGISTRIES_TAB_NAME,
       labelForAddon
 
@@ -289,6 +297,21 @@ export default {
       return this.value.spec.rkeConfig.chartValues;
     },
 
+    kubernetesVersion() {
+      return this.value.spec.kubernetesVersion;
+    },
+
+    rke2Charts() {
+      const rke2Versions = this.rke2Versions || [];
+      const kubernetesVersion = this.kubernetesVersion;
+
+      const charts = rke2Versions
+        .find((version) => version.id === kubernetesVersion)
+        ?.charts ?? {};
+
+      return Object.keys(charts);
+    },
+
     serverConfig() {
       return this.value.spec.rkeConfig.machineGlobalConfig;
     },
@@ -568,7 +591,7 @@ export default {
         out.tooltip[role] = this.t(`cluster.machinePool.nodeTotals.tooltip.${ role }`, { count: counts[role] });
       }
 
-      if (counts.etcd === 0) {
+      if (counts.etcd <= 0) {
         out.color.etcd = NODE_TOTAL.error.color;
         out.icon.etcd = NODE_TOTAL.error.icon;
       } else if (counts.etcd === 1 || counts.etcd % 2 === 0 || counts.etcd > 7) {
@@ -576,7 +599,7 @@ export default {
         out.icon.etcd = NODE_TOTAL.warning.icon;
       }
 
-      if (counts.controlPlane === 0) {
+      if (counts.controlPlane <= 0) {
         out.color.controlPlane = NODE_TOTAL.error.color;
         out.icon.controlPlane = NODE_TOTAL.error.icon;
       } else if (counts.controlPlane === 1) {
@@ -584,7 +607,7 @@ export default {
         out.icon.controlPlane = NODE_TOTAL.warning.icon;
       }
 
-      if (counts.worker === 0) {
+      if (counts.worker <= 0) {
         out.color.worker = NODE_TOTAL.error.color;
         out.icon.worker = NODE_TOTAL.error.icon;
       } else if (counts.worker === 1) {
@@ -1062,24 +1085,6 @@ export default {
       }
     },
 
-    async initSchedulingCustomization() {
-      this.schedulingCustomizationFeatureEnabled = this.features(SCHEDULING_CUSTOMIZATION);
-      try {
-        this.clusterAgentDefaultPC = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS })).value) || null;
-      } catch (e) {
-        this.errors.push(e);
-      }
-      try {
-        this.clusterAgentDefaultPDB = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET })).value) || null;
-      } catch (e) {
-        this.errors.push(e);
-      }
-
-      if (this.schedulingCustomizationFeatureEnabled && this.mode === _CREATE && isEmpty(this.value?.spec?.clusterAgentDeploymentCustomization?.schedulingCustomization)) {
-        set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
-      }
-    },
-
     setSchedulingCustomization(val) {
       if (val) {
         set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
@@ -1315,7 +1320,7 @@ export default {
         delete clonedCurrentConfig.metadata;
 
         if (this.provider === VMWARE_VSPHERE) {
-          machinePool.config = mergeWithReplaceArrays(clonedLatestConfig, clonedCurrentConfig);
+          machinePool.config = mergeWithReplace(clonedLatestConfig, clonedCurrentConfig, { mutateOriginal: true });
         } else {
           machinePool.config = merge(clonedLatestConfig, clonedCurrentConfig);
         }
@@ -1701,7 +1706,7 @@ export default {
       const defaultChartValue = this.versionInfo[name];
       const key = this.chartVersionKey(name);
 
-      return merge({}, defaultChartValue?.values || {}, this.userChartValues[key] || {});
+      return mergeWithReplace(defaultChartValue?.values, this.userChartValues[key]);
     },
 
     initServerAgentArgs() {
@@ -1860,7 +1865,9 @@ export default {
 
     applyChartValues(rkeConfig) {
       rkeConfig.chartValues = {};
-      this.addonNames.forEach((name) => {
+      const charts = [...this.addonNames, ...this.rke2Charts];
+
+      charts.forEach((name) => {
         const key = this.chartVersionKey(name);
         const userValues = this.userChartValues[key];
 
@@ -2450,6 +2457,7 @@ export default {
             :scheduling-customization-feature-enabled="schedulingCustomizationFeatureEnabled"
             :default-p-c="clusterAgentDefaultPC"
             :default-p-d-b="clusterAgentDefaultPDB"
+            :scheduling-customization-originally-enabled="schedulingCustomizationOriginallyEnabled"
             @scheduling-customization-changed="setSchedulingCustomization"
           />
         </Tab>

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

@@ -48,6 +48,11 @@ export default {
       type:     Boolean,
       required: false
     },
+    schedulingCustomizationOriginallyEnabled: {
+      type:    Boolean,
+      default: false
+    },
+
     defaultPC: {
       type:    Object,
       default: () => {},
@@ -149,7 +154,7 @@ export default {
     },
 
     schedulingCustomizationVisible() {
-      return this.schedulingCustomizationFeatureEnabled || (this.isEdit && this.value.schedulingCustomization );
+      return this.schedulingCustomizationFeatureEnabled || this.schedulingCustomizationOriginallyEnabled;
     },
 
     affinityOptions() {

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

@@ -8,6 +8,8 @@ import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import { Banner } from '@components/Banner';
 import UnitInput from '@shell/components/form/UnitInput.vue';
 import { randomStr } from '@shell/utils/string';
+import FormValidation from '@shell/mixins/form-validation';
+import { MACHINE_POOL_VALIDATION } from '@shell/utils/validators/machine-pool';
 
 export default {
 
@@ -25,6 +27,8 @@ export default {
     UnitInput
   },
 
+  mixins: [FormValidation],
+
   props: {
     value: {
       type:     Object,
@@ -122,6 +126,12 @@ export default {
       uuid: randomStr(),
 
       unhealthyNodeTimeoutInteger: this.value.pool.unhealthyNodeTimeout ? parseDuration(this.value.pool.unhealthyNodeTimeout) : 0,
+
+      validationErrors: [],
+
+      MACHINE_POOL_VALIDATION,
+
+      fvFormRuleSets: MACHINE_POOL_VALIDATION.RULESETS,
     };
   },
 
@@ -136,7 +146,7 @@ export default {
 
     isWindows() {
       return this.value?.config?.os === 'windows';
-    },
+    }
   },
 
   watch: {
@@ -148,6 +158,20 @@ export default {
       } else {
         this.value.pool.machineOS = 'linux';
       }
+    },
+
+    validationErrors: {
+      handler(newValue) {
+        this.$emit('validationChanged', newValue.length === 0);
+      },
+      deep: true
+    },
+
+    fvFormIsValid: {
+      handler(newValue) {
+        this.$emit('validationChanged', newValue);
+      },
+      deep: true
     }
   },
 
@@ -227,6 +251,8 @@ export default {
           :label="t('cluster.machinePool.name.label')"
           :required="true"
           :disabled="!value.config || !!value.config.id || busy"
+          :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.NAME)"
+          data-testid="machine-pool-name-input"
         />
       </div>
       <div class="col span-4">
@@ -238,6 +264,8 @@ export default {
           type="number"
           min="0"
           :required="true"
+          :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.QUANTITY)"
+          data-testid="machine-pool-quantity-input"
         />
       </div>
       <div class="col span-4 pt-5">
@@ -264,7 +292,10 @@ export default {
         />
       </div>
     </div>
-    <hr class="mt-10">
+    <hr
+      class="mt-10"
+      role="none"
+    >
     <component
       :is="configComponent"
       v-if="value.config && configComponent"

package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue

@@ -90,8 +90,8 @@ export default {
           v-model:value="etcd.snapshotRetention"
           :mode="mode"
           :label="t('cluster.rke2.etcd.snapshotRetention.label')"
-          :suffix="t('cluster.rke2.snapshots.suffix')"
-          :tooltip="t('cluster.rke2.etcd.snapshotRetention.tooltip')"
+          :suffix="s3Backup ? t('cluster.rke2.snapshots.s3Suffix') : t('cluster.rke2.snapshots.suffix')"
+          :tooltip="s3Backup ? t('cluster.rke2.etcd.snapshotRetention.tooltip') : undefined"
         />
       </div>
     </div>

package/edit/token.vue

@@ -210,6 +210,7 @@ export default {
             :disabled="form.expiryType !== 'custom'"
             type="number"
             :mode="mode"
+            :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expiration')"
           >
           <Select
             v-model:value="form.customExpiryUnits"
@@ -217,6 +218,7 @@ export default {
             :options="expiryUnitsOptions"
             :clearable="false"
             :reduce="opt=>opt.value"
+            :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expirationUnits')"
           />
         </div>
       </div>

package/edit/workload/index.vue

@@ -599,6 +599,7 @@ export default {
               v-if="!isView"
               type="button"
               class="btn-sm role-link"
+              data-testid="workload-button-add-container"
               @click="addContainerBtn"
             >
               <i class="icon icon-plus pr-5" /> {{ t('workload.container.addContainer') }}