@rancher/shell 3.0.0-rc.8 → 3.0.0

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 from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
+import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 
@@ -15,7 +15,8 @@ describe('component: DirectoryConfig', () => {
         provisioning: '',
         k8sDistro:    '',
       },
-      mode: _CREATE,
+      k8sVersion: 'k3s',
+      mode:       _CREATE,
     },
     mocks: {
       $store: {
@@ -34,203 +35,119 @@ describe('component: DirectoryConfig', () => {
     );
 
     const title = wrapper.find('h3');
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
     const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
     expect(title.exists()).toBe(true);
-    expect(checkbox.exists()).toBe(true);
-    // for the default config, checkbox should be checked
-    expect(wrapper.vm.isSettingCommonConfig).toBe(true);
-    expect(commonInput.exists()).toBe(true);
+    expect(radioInput.exists()).toBe(true);
+
+    // for the default config, the default radio input should be "default"
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.DEFAULT);
 
-    // since we have all of the vars empty, then the individual inputs should not be there
+    // since we have all of the vars empty, then the inputs should not be there
+    expect(commonInput.exists()).toBe(false);
     expect(systemAgentInput.exists()).toBe(false);
     expect(provisioningInput.exists()).toBe(false);
     expect(k8sDistroInput.exists()).toBe(false);
   });
 
-  it('should render the component with configuration being an empty object, without errors', () => {
+  it('updating common base directory should set the correct values on each data dir variable', async() => {
     const newMountOptions = clone(mountOptions);
 
-    newMountOptions.propsData.value = {};
-
-    wrapper = mount(
-      DirectoryConfig,
-      newMountOptions
-    );
-
-    const title = wrapper.find('h3');
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
-    const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
-    const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
-    const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
-
-    expect(title.exists()).toBe(true);
-    expect(checkbox.exists()).toBe(true);
-    // for the default config, checkbox should be checked
-    expect(wrapper.vm.isSettingCommonConfig).toBe(true);
-    expect(commonInput.exists()).toBe(true);
-
-    // since we have all of the vars empty, then the individual inputs should not be there
-    expect(systemAgentInput.exists()).toBe(false);
-    expect(provisioningInput.exists()).toBe(false);
-    expect(k8sDistroInput.exists()).toBe(false);
-  });
-
-  it('updating common config path should set the correct values on each data dir variable', async() => {
     wrapper = mount(
       DirectoryConfig,
-      mountOptions
+      {
+        ...newMountOptions,
+        // couldn't use setData, so this is the next best solution
+        data() {
+          return { dataConfigRadioValue: DATA_DIR_RADIO_OPTIONS.COMMON };
+        }
+      }
     );
 
     const inputPath = 'some-data-dir';
     const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
 
+    // update base dir value
+    expect(commonInput.exists()).toBe(true);
     commonInput.setValue(inputPath);
     await nextTick();
 
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
+    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 }`);
   });
 
   it('updating each individual data dir should set the correct values on each data dir variable', async() => {
-    wrapper = mount(
-      DirectoryConfig,
-      mountOptions
-    );
-
-    const inputPath = 'some-data-dir';
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-
-    await checkbox.find('label').trigger('click');
-    await nextTick();
-    await nextTick();
-
-    expect(wrapper.vm.isSettingCommonConfig).toBe(false);
-
-    const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
-    const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
-    const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
-
-    systemAgentInput.setValue(inputPath);
-    provisioningInput.setValue(inputPath);
-    k8sDistroInput.setValue(inputPath);
-    await nextTick();
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
-  });
-
-  it('checkbox should be checked if all data dir values are the same (with all data dir values filled)', () => {
     const newMountOptions = clone(mountOptions);
-    const inputPath = 'some-data-dir';
-
-    newMountOptions.propsData.value.systemAgent = inputPath;
-    newMountOptions.propsData.value.provisioning = inputPath;
-    newMountOptions.propsData.value.k8sDistro = inputPath;
 
     wrapper = mount(
       DirectoryConfig,
-      newMountOptions
+      {
+        ...newMountOptions,
+        // couldn't use setData, so this is the next best solution
+        data() {
+          return { dataConfigRadioValue: DATA_DIR_RADIO_OPTIONS.CUSTOM };
+        }
+      }
     );
+    const inputPath = 'some-data-dir';
+    const agentValue = `${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`;
+    const provisioningValue = `${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`;
+    const k8sDistroValue = `${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_RKE2 }`;
 
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-
-    expect(checkbox.exists()).toBe(true);
-    expect(wrapper.vm.isSettingCommonConfig).toBe(true);
-
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
-    expect(commonInput.exists()).toBe(true);
-    expect(systemAgentInput.exists()).toBe(false);
-    expect(provisioningInput.exists()).toBe(false);
-    expect(k8sDistroInput.exists()).toBe(false);
+    systemAgentInput.setValue(agentValue);
+    provisioningInput.setValue(provisioningValue);
+    k8sDistroInput.setValue(k8sDistroValue);
+    await nextTick();
 
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(agentValue);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(provisioningValue);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(k8sDistroValue);
   });
 
-  it('checkbox should NOT be checked if some data dir values are the different (with all data dir values filled)', () => {
+  it('should render the component with configuration being an empty object, without errors and radio be of value DATA_DIR_RADIO_OPTIONS.DEFAULT (edit scenario)', () => {
     const newMountOptions = clone(mountOptions);
-    const inputPath1 = 'some-data-dir1';
-    const inputPath2 = 'some-data-dir2';
-    const inputPath3 = 'some-data-dir3';
 
-    newMountOptions.propsData.value.systemAgent = inputPath1;
-    newMountOptions.propsData.value.provisioning = inputPath2;
-    newMountOptions.propsData.value.k8sDistro = inputPath3;
+    newMountOptions.propsData.value = {};
+    newMountOptions.propsData.mode = _EDIT;
 
     wrapper = mount(
       DirectoryConfig,
       newMountOptions
     );
 
-    expect(wrapper.vm.isSettingCommonConfig).toBe(false);
-
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
+    const title = wrapper.find('h3');
+    const radioInput = wrapper.find('[data-testid="rke2-directory-config-radio-input"]');
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
-    expect(commonInput.exists()).toBe(false);
-    expect(systemAgentInput.exists()).toBe(true);
-    expect(provisioningInput.exists()).toBe(true);
-    expect(k8sDistroInput.exists()).toBe(true);
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath1);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath2);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath3);
-  });
-
-  it('on a mode different than _CREATE all visible inputs should be disabled (with common config)', () => {
-    const newMountOptions = clone(mountOptions);
-    const inputPath = 'some-data-dir';
-
-    newMountOptions.propsData.value.systemAgent = inputPath;
-    newMountOptions.propsData.value.provisioning = inputPath;
-    newMountOptions.propsData.value.k8sDistro = inputPath;
-    newMountOptions.propsData.mode = _EDIT;
-
-    wrapper = mount(
-      DirectoryConfig,
-      newMountOptions
-    );
+    expect(title.exists()).toBe(true);
+    expect(radioInput.exists()).toBe(true);
 
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
-    const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
-    const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
-    const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.DEFAULT);
 
-    expect(checkbox.exists()).toBe(true);
-    expect(commonInput.exists()).toBe(true);
+    // since we have all of the vars empty, then the inputs should not be there
     expect(systemAgentInput.exists()).toBe(false);
     expect(provisioningInput.exists()).toBe(false);
     expect(k8sDistroInput.exists()).toBe(false);
-
-    expect(checkbox.find('label').classes('disabled')).toBe(true);
-    expect(commonInput.attributes('disabled')).toBe('');
   });
 
-  it('on a mode different than _CREATE all visible inputs should be disabled (with different values)', () => {
+  it('radio input should be set to DATA_DIR_RADIO_OPTIONS.CUSTOM with all data dir values existing and different (edit scenario)', async() => {
     const newMountOptions = clone(mountOptions);
-    const inputPath1 = 'some-data-dir1';
-    const inputPath2 = 'some-data-dir2';
-    const inputPath3 = 'some-data-dir3';
+    const inputPath = 'some-data-dir';
 
-    newMountOptions.propsData.value.systemAgent = inputPath1;
-    newMountOptions.propsData.value.provisioning = inputPath2;
-    newMountOptions.propsData.value.k8sDistro = inputPath3;
+    newMountOptions.propsData.value.systemAgent = `${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`;
+    newMountOptions.propsData.value.provisioning = `${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`;
+    newMountOptions.propsData.value.k8sDistro = `${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`;
     newMountOptions.propsData.mode = _EDIT;
 
     wrapper = mount(
@@ -238,21 +155,18 @@ describe('component: DirectoryConfig', () => {
       newMountOptions
     );
 
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
+    expect(wrapper.vm.dataConfigRadioValue).toBe(DATA_DIR_RADIO_OPTIONS.CUSTOM);
+
     const systemAgentInput = wrapper.find('[data-testid="rke2-directory-config-systemAgent-data-dir"]');
     const provisioningInput = wrapper.find('[data-testid="rke2-directory-config-provisioning-data-dir"]');
     const k8sDistroInput = wrapper.find('[data-testid="rke2-directory-config-k8sDistro-data-dir"]');
 
-    expect(checkbox.exists()).toBe(true);
-    expect(commonInput.exists()).toBe(false);
-    expect(systemAgentInput.exists()).toBe(true);
-    expect(provisioningInput.exists()).toBe(true);
-    expect(k8sDistroInput.exists()).toBe(true);
+    expect(systemAgentInput.isVisible()).toBe(true);
+    expect(provisioningInput.isVisible()).toBe(true);
+    expect(k8sDistroInput.isVisible()).toBe(true);
 
-    expect(checkbox.find('label').classes('disabled')).toBe(true);
-    expect(systemAgentInput.attributes('disabled')).toBe('');
-    expect(provisioningInput.attributes('disabled')).toBe('');
-    expect(k8sDistroInput.attributes('disabled')).toBe('');
+    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 }`);
   });
 });

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

@@ -2,6 +2,7 @@ import { mount, shallowMount } from '@vue/test-utils';
 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';
 
 /**
  * DISCLAIMER ***************************************************************************************
@@ -242,7 +243,9 @@ describe('component: rke2', () => {
 
     await wrapper.vm._doSaveOverride(jest.fn());
 
-    expect(wrapper.vm.chartValues[`${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`]).toStrictEqual('my-k8s-distro-path/etc/config-files/cloud-provider-config');
+    const cloudConfigPath = get(wrapper.vm.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`);
+
+    expect(cloudConfigPath).toStrictEqual('my-k8s-distro-path/etc/config-files/cloud-provider-config');
   });
 
   // TODO: Complete test after implementing fetch https://github.com/rancher/dashboard/issues/9322

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

@@ -36,6 +36,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  inheritAttrs: false,
+
   props: {
     mode: {
       type:     String,

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

@@ -62,6 +62,7 @@ import Upgrade from '@shell/edit/provisioning.cattle.io.cluster/tabs/upgrade';
 import Registries from '@shell/edit/provisioning.cattle.io.cluster/tabs/registries';
 import AddOnConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig';
 import Advanced from '@shell/edit/provisioning.cattle.io.cluster/tabs/Advanced';
+import { DEFAULT_COMMON_BASE_PATH, DEFAULT_SUBDIRS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig';
 import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 import VsphereUtils from '@shell/utils/v-sphere';
@@ -1480,12 +1481,13 @@ export default {
           this.agentConfig['cloud-provider-config'] = `secret://fleet-default:${ harvesterKubeconfigSecret?.metadata?.name }`;
 
           if (this.isCreate) {
-            this.chartValues[`${ HARVESTER_CLOUD_PROVIDER }.global.cattle.clusterName`] = this.value.metadata.name;
+            set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.global.cattle.clusterName`, this.value.metadata.name);
           }
 
-          const distroRoot = this.value?.spec?.rkeConfig?.dataDirectories?.k8sDistro?.length ? this.value?.spec?.rkeConfig?.dataDirectories?.k8sDistro : '/var/lib/rancher/rke2';
+          const distroSubdir = this.value?.spec?.kubernetesVersion?.includes('k3s') ? DEFAULT_SUBDIRS.K8S_DISTRO_K3S : DEFAULT_SUBDIRS.K8S_DISTRO_RKE2;
+          const distroRoot = this.value?.spec?.rkeConfig?.dataDirectories?.k8sDistro?.length ? this.value?.spec?.rkeConfig?.dataDirectories?.k8sDistro : `${ DEFAULT_COMMON_BASE_PATH }/${ distroSubdir }`;
 
-          this.chartValues[`${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`] = `${ distroRoot }/etc/config-files/cloud-provider-config`;
+          set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`, `${ distroRoot }/etc/config-files/cloud-provider-config`);
         }
       } catch (err) {
         this.errors.push(err);

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

@@ -80,10 +80,14 @@ export default {
       return i !== 0 || !this.agentConfig;
     },
     showEmptyKubeletArg(config) {
-      return !this.serverArg?.['kubelet-arg']?.length && !config?.['kubelet-arg']?.length;
+      return !this.serverArgs?.['kubelet-arg']?.length && !config?.['kubelet-arg']?.length;
     },
     onInputProtectKernelDefaults(value) {
-      this.agentConfig ? this.agentConfig = value : this.serverConfig['protect-kernel-defaults'] = value;
+      if (this.agentConfig && this.agentConfig['protect-kernel-defaults'] !== undefined ) {
+        this.agentConfig['protect-kernel-defaults'] = value;
+      } else {
+        this.serverConfig['protect-kernel-defaults'] = value;
+      }
     }
   }
 };
@@ -100,6 +104,7 @@ export default {
     <template v-if="haveArgInfo">
       <DirectoryConfig
         v-model:value="value.spec.rkeConfig.dataDirectories"
+        :k8s-version="value.spec.kubernetesVersion"
         :mode="mode"
       />
       <h3>{{ t('cluster.advanced.argInfo.title') }}</h3>

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

@@ -1,14 +1,29 @@
 
 <script>
-import { Checkbox } from '@components/Form/Checkbox';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { _CREATE } from '@shell/config/query-params';
+import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
+
+export const DATA_DIR_RADIO_OPTIONS = {
+  DEFAULT: 'defaultDataDir',
+  COMMON:  'commonBaseDataDir',
+  CUSTOM:  'customDataDir',
+};
+
+export const DEFAULT_COMMON_BASE_PATH = '/var/lib/rancher';
+
+export const DEFAULT_SUBDIRS = {
+  AGENT:           'agent',
+  PROVISIONING:    'provisioning',
+  K8S_DISTRO_RKE2: 'rke2',
+  K8S_DISTRO_K3S:  'k3s',
+};
 
 export default {
   name:       'DirectoryConfig',
   components: {
-    Checkbox,
     LabeledInput,
+    RadioGroup
   },
   props: {
     mode: {
@@ -16,52 +31,114 @@ export default {
       required: true,
     },
 
+    k8sVersion: {
+      type:     String,
+      required: true,
+    },
+
     value: {
       type:     Object,
       required: true,
     },
   },
   data() {
-    let atLeastOneDirWithAnIdentifier = false;
-    let allDirsWithSameIdentifier = false;
-
-    if (this.value?.systemAgent?.length || this.value?.provisioning?.length || this.value?.k8sDistro?.length) {
-      atLeastOneDirWithAnIdentifier = true;
-      if (this.value?.systemAgent === this.value?.provisioning && this.value?.provisioning === this.value?.k8sDistro &&
-      this.value?.systemAgent === this.value?.k8sDistro) {
-        allDirsWithSameIdentifier = true;
+    let dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.DEFAULT;
+    let k8sDistroSubDir = DEFAULT_SUBDIRS.K8S_DISTRO_RKE2;
+
+    if (this.k8sVersion && this.k8sVersion.includes('k3s')) {
+      k8sDistroSubDir = DEFAULT_SUBDIRS.K8S_DISTRO_K3S;
+    }
+
+    if (this.mode !== _CREATE) {
+      if (this.value?.systemAgent?.length || this.value?.provisioning?.length || this.value?.k8sDistro?.length) {
+        dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.CUSTOM;
       }
     }
 
     return {
-      isSettingCommonConfig: !(atLeastOneDirWithAnIdentifier && !allDirsWithSameIdentifier),
-      commonConfig:          allDirsWithSameIdentifier ? this.value?.systemAgent : '',
+      DATA_DIR_RADIO_OPTIONS,
+      dataConfigRadioValue,
+      k8sDistroSubDir,
+      commonConfig: '',
     };
   },
   watch: {
     commonConfig(neu) {
-      if (neu && neu.length && this.isSettingCommonConfig) {
-        this.value.systemAgent = neu;
-        this.value.provisioning = neu;
-        this.value.k8sDistro = neu;
+      if (neu && neu.length && this.dataConfigRadioValue === DATA_DIR_RADIO_OPTIONS.COMMON) {
+        this.value.systemAgent = `${ neu }/${ DEFAULT_SUBDIRS.AGENT }`;
+        this.value.provisioning = `${ neu }/${ DEFAULT_SUBDIRS.PROVISIONING }`;
+        this.value.k8sDistro = `${ neu }/${ this.k8sDistroSubDir }`;
+      }
+    },
+    k8sVersion: {
+      handler(neu) {
+        if (neu && neu.includes('k3s')) {
+          this.k8sDistroSubDir = DEFAULT_SUBDIRS.K8S_DISTRO_K3S;
+        } else {
+          this.k8sDistroSubDir = DEFAULT_SUBDIRS.K8S_DISTRO_RKE2;
+        }
+
+        if (this.value.k8sDistro) {
+          this.value.k8sDistro = `${ neu }/${ this.k8sDistroSubDir }`;
+        }
       }
     }
   },
   computed: {
-    disableEditInput() {
-      return this.mode !== _CREATE;
+    dataConfigRadioOptions() {
+      const defaultDataDirOption = {
+        value: DATA_DIR_RADIO_OPTIONS.DEFAULT,
+        label: this.t('cluster.directoryConfig.radioInput.defaultLabel')
+      };
+      const customDataDirOption = {
+        value: DATA_DIR_RADIO_OPTIONS.CUSTOM,
+        label: this.t('cluster.directoryConfig.radioInput.customLabel')
+      };
+
+      if (this.mode === _CREATE) {
+        return [
+          defaultDataDirOption,
+          { value: DATA_DIR_RADIO_OPTIONS.COMMON, label: this.t('cluster.directoryConfig.radioInput.commonLabel') },
+          customDataDirOption
+        ];
+      } else {
+        return [
+          defaultDataDirOption,
+          customDataDirOption
+        ];
+      }
     }
   },
   methods: {
-    handleCommonConfig(val) {
-      this.isSettingCommonConfig = val;
+    handleRadioInput(val) {
+      switch (val) {
+      case DATA_DIR_RADIO_OPTIONS.DEFAULT:
+        if (this.mode === _CREATE) {
+          this.commonConfig = '';
+        }
+        this.value.systemAgent = '';
+        this.value.provisioning = '';
+        this.value.k8sDistro = '';
+
+        this.dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.DEFAULT;
+        break;
+      case DATA_DIR_RADIO_OPTIONS.COMMON:
+        this.commonConfig = DEFAULT_COMMON_BASE_PATH;
+
+        this.dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.COMMON;
+        break;
+      // default is custom config
+      default:
+        if (this.mode === _CREATE) {
+          this.commonConfig = '';
+        }
 
-      if (val) {
         this.value.systemAgent = '';
         this.value.provisioning = '';
         this.value.k8sDistro = '';
-      } else {
-        this.commonConfig = '';
+
+        this.dataConfigRadioValue = DATA_DIR_RADIO_OPTIONS.CUSTOM;
+        break;
       }
     }
   },
@@ -74,33 +151,31 @@ export default {
       <h3 class="mb-20">
         {{ t('cluster.directoryConfig.title') }}
       </h3>
-      <Checkbox
+      <RadioGroup
+        :value="dataConfigRadioValue"
         class="mb-10"
-        :value="isSettingCommonConfig"
         :mode="mode"
-        :label="t('cluster.directoryConfig.checkboxText')"
-        :disabled="disableEditInput"
-        data-testid="rke2-directory-config-individual-config-checkbox"
-        @update:value="handleCommonConfig"
+        :options="dataConfigRadioOptions"
+        name="directory-config-radio"
+        data-testid="rke2-directory-config-radio-input"
+        @update:value="handleRadioInput"
       />
       <LabeledInput
-        v-if="isSettingCommonConfig"
+        v-if="dataConfigRadioValue === DATA_DIR_RADIO_OPTIONS.COMMON"
         v-model:value="commonConfig"
         class="mb-20"
         :mode="mode"
         :label="t('cluster.directoryConfig.common.label')"
         :tooltip="t('cluster.directoryConfig.common.tooltip')"
-        :disabled="disableEditInput"
         data-testid="rke2-directory-config-common-data-dir"
       />
-      <div v-if="!isSettingCommonConfig">
+      <div v-if="dataConfigRadioValue === DATA_DIR_RADIO_OPTIONS.CUSTOM">
         <LabeledInput
           v-model:value="value.systemAgent"
           class="mb-20"
           :mode="mode"
           :label="t('cluster.directoryConfig.systemAgent.label')"
           :tooltip="t('cluster.directoryConfig.systemAgent.tooltip')"
-          :disabled="disableEditInput"
           data-testid="rke2-directory-config-systemAgent-data-dir"
         />
         <LabeledInput
@@ -109,7 +184,6 @@ export default {
           :mode="mode"
           :label="t('cluster.directoryConfig.provisioning.label')"
           :tooltip="t('cluster.directoryConfig.provisioning.tooltip')"
-          :disabled="disableEditInput"
           data-testid="rke2-directory-config-provisioning-data-dir"
         />
         <LabeledInput
@@ -118,7 +192,6 @@ export default {
           :mode="mode"
           :label="t('cluster.directoryConfig.k8sDistro.label')"
           :tooltip="t('cluster.directoryConfig.k8sDistro.tooltip')"
-          :disabled="disableEditInput"
           data-testid="rke2-directory-config-k8sDistro-data-dir"
         />
       </div>

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

@@ -317,7 +317,7 @@ export default {
             />
           </h3>
           <UnitInput
-            v-model.number="unhealthyNodeTimeoutInteger"
+            v-model:value="unhealthyNodeTimeoutInteger"
             :hide-arrows="true"
             :placeholder="t('containerResourceLimit.cpuPlaceholder')"
             :mode="mode"

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

@@ -154,7 +154,6 @@ export default {
               :mode="mode"
               :data-testid="`registry-auth-host-input-${i}`"
             />
-
             <SelectOrCreateAuthSecret
               v-model:value="row.value.authConfigSecretName"
               :register-before-hook="wrapRegisterBeforeHook"
@@ -168,6 +167,7 @@ export default {
               generate-name="registryconfig-auth-"
               :data-testid="`registry-auth-select-or-create-${i}`"
               :cache-secrets="true"
+              @update:value="update"
             />
           </div>
           <div class="col span-6">

package/edit/ui.cattle.io.navlink.vue

@@ -20,9 +20,10 @@ const LINK_TARGET_BLANK = '_blank';
 const LINK_TARGET_SELF = '_self';
 
 export default {
-  emits:      ['update:value.spec.iconSrc ', 'input'],
-  mixins:     [CreateEditView, FormValidation],
-  components: {
+  emits:        ['update:value.spec.iconSrc ', 'input'],
+  mixins:       [CreateEditView, FormValidation],
+  inheritAttrs: false,
+  components:   {
     CruResource,
     LabeledInput,
     RadioGroup,