@rancher/shell 3.0.0-rc.9 → 3.0.0

package/detail/catalog.cattle.io.app.vue

@@ -9,7 +9,8 @@ import RelatedResources from '@shell/components/RelatedResources';
 import jsyaml from 'js-yaml';
 import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
-import { sortBy } from '~shell/utils/sort';
+import { sortBy } from '@shell/utils/sort';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'DetailRelease',
@@ -30,9 +31,15 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('catalog/load');
+    const promises = {
+      catalog:       this.$store.dispatch('catalog/load'),
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
+      secrets:       this.value.fetchValues(true),
+    };
 
-    this.allOperations = await this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION });
+    const res = await allHash(promises);
+
+    this.allOperations = res.allOperations;
   },
 
   computed: {
@@ -45,7 +52,7 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {});
+      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
 
       return jsyaml.dump(combined);
     },
@@ -95,6 +102,12 @@ export default {
       }
     },
   },
+
+  watch: {
+    'value.secretId'(neu, old) {
+      this.value.fetchValues(true);
+    }
+  },
 };
 </script>
 

package/detail/fleet.cattle.io.cluster.vue

@@ -6,6 +6,7 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
 import { MANAGEMENT, FLEET } from '@shell/config/types';
 import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { allHash } from 'utils/promise';
 
 export default {
   name: 'FleetDetailCluster',
@@ -29,17 +30,18 @@ export default {
 
   async fetch() {
     const clusterId = this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
-
-    this.rancherCluster = await this.$store.dispatch('management/find', {
-      type: MANAGEMENT.CLUSTER,
-      id:   clusterId
+    const hash = await allHash({
+      rancherCluster: this.$store.dispatch('management/find', {
+        type: MANAGEMENT.CLUSTER,
+        id:   clusterId
+      }),
+      repos:             this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
+      workspaces:        this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE }),
+      bundleDeployments: this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT })
     });
 
-    this.allRepos = await this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
-
-    await this.$store.dispatch('management/findAll', { type: FLEET.BUNDLE_DEPLOYMENT });
+    this.rancherCluster = hash.rancherCluster;
+    this.allRepos = hash.repos;
   },
 
   data() {

package/detail/fleet.cattle.io.gitrepo.vue

@@ -42,7 +42,7 @@ export default {
   },
   computed: {
     gitRepoHasClusters() {
-      return this.value?.clusterResourceStatus?.length;
+      return this.value.status.desiredReadyClusters;
     },
     clusterSchema() {
       return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);

package/edit/cis.cattle.io.clusterscan.vue

@@ -12,7 +12,7 @@ import { allHash } from '@shell/utils/promise';
 import { Checkbox } from '@components/Form/Checkbox';
 import { RadioGroup } from '@components/Form/Radio';
 import { get } from '@shell/utils/object';
-import { _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
+import { _VIEW, _CREATE } from '@shell/config/query-params';
 import { isValidCron } from 'cron-validator';
 import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
 
@@ -43,7 +43,8 @@ export default {
     // in the clusterscan edit/create views the "canBeScheduled" won't run properly
     await this.schema.fetchResourceFields();
 
-    if (this.realMode === _CREATE || this.realMode === _EDIT) {
+    // Only initialize on create or if we don't have a spec object (added for resilience)
+    if (this.realMode === _CREATE || !this.value.spec) {
       const includeScheduling = this.value.canBeScheduled();
       const spec = this.value.spec || {};
 
@@ -326,7 +327,7 @@ export default {
           </div>
           <div class="col span-6">
             <UnitInput
-              v-model.number="scheduledScanConfig.retentionCount"
+              v-model:value="scheduledScanConfig.retentionCount"
               :suffix="t('cis.reports')"
               type="number"
               :mode="mode"

package/edit/fleet.cattle.io.gitrepo.vue

@@ -25,6 +25,7 @@ import { CAPI, CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annot
 import { SECRET_TYPES } from '@shell/config/secret';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import FormValidation from '@shell/mixins/form-validation';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -33,6 +34,8 @@ const _SPECIFY = 'specify';
 export default {
   name: 'CruGitRepo',
 
+  inheritAttrs: false,
+
   emits: ['input'],
 
   components: {
@@ -50,7 +53,7 @@ export default {
     SelectOrCreateAuthSecret,
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
 
   async fetch() {
     const hash = await checkSchemasForFindAllHash({
@@ -153,7 +156,8 @@ export default {
       stepRepoInfo,
       stepTargetInfo,
       addRepositorySteps,
-      displayHelmRepoURLRegex: false
+      displayHelmRepoURLRegex: false,
+      fvFormRuleSets:          [{ path: 'spec.repo', rules: ['required'] }]
     };
   },
 
@@ -253,7 +257,7 @@ export default {
     },
 
     stepOneRequires() {
-      return !!this.value.metadata.name && !!this.refValue;
+      return !!this.value.metadata.name && !!this.refValue && !!this.fvFormIsValid;
     },
   },
 
@@ -265,6 +269,8 @@ export default {
     targetAdvanced:             'updateTargets',
     tlsMode:                    'updateTls',
     caBundle:                   'updateTls',
+    'value.metadata.name':      'stepOneReady',
+    'value.spec.repo':          'stepOneReady',
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -456,10 +462,6 @@ export default {
       this.tlsMode = event;
     },
 
-    onUpdateRepoName() {
-      this.stepOneReady();
-    },
-
     stepOneReady() {
       this.addRepositorySteps[0]['ready'] = this.stepOneRequires;
     },
@@ -528,7 +530,6 @@ export default {
         :namespaced="false"
         :mode="mode"
         @update:value="$emit('input', $event)"
-        @change="onUpdateRepoName"
       />
 
       <div class="row">
@@ -552,6 +553,8 @@ export default {
             :mode="mode"
             label-key="fleet.gitRepo.repo.label"
             :placeholder="t('fleet.gitRepo.repo.placeholder', null, true)"
+            :required="true"
+            :rules="fvGetAndReportPathRules('spec.repo')"
           />
         </div>
         <div class="col span-6">

package/edit/management.cattle.io.project.vue

@@ -103,7 +103,8 @@ export default {
     this.value.metadata['namespace'] = this.$store.getters['currentCluster'].id;
     this.value['spec'] = this.value.spec || {};
     this.value.spec['containerDefaultResourceLimit'] = this.value.spec.containerDefaultResourceLimit || {};
-    if (!this.$store.getters['auth/principalId'].includes('local://')) {
+    // norman (and matching steve) resources treat annotations containing `cattle.io` as immutable, so only do this for the create world
+    if (this.isCreate && !this.$store.getters['auth/principalId'].includes('local://')) {
       this.value.metadata.annotations[CREATOR_PRINCIPAL_ID] = this.$store.getters['auth/principalId'];
     }
   },

package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue

@@ -102,7 +102,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { summary: '' };
           } else {
-            this.value.annotations['summary'] = '';
+            this.value.annotations = { ...this.value.annotations, summary: '' };
           }
         } else {
           this.value.annotations['summary'] = '';
@@ -124,7 +124,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { message: '' };
           } else {
-            this.value.annotations['message'] = '';
+            this.value.annotations = { ...this.value.annotations, message: '' };
           }
         } else {
           this.value.annotations['message'] = '';
@@ -146,7 +146,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { description: '' };
           } else {
-            this.value.annotations['description'] = '';
+            this.value.annotations = { ...this.value.annotations, description: '' };
           }
         } else {
           this.value.annotations['description'] = '';
@@ -168,7 +168,7 @@ export default {
           if (isEmpty(this.value?.annotations)) {
             this.value['annotations'] = { runbook_url: '' };
           } else {
-            this.value.annotations['runbook_url'] = '';
+            this.value.annotations = { ...this.value.annotations, runbook_url: '' };
           }
         } else {
           this.value.annotations['runbook_url'] = '';
@@ -213,7 +213,7 @@ export default {
         return undefined;
       },
       set(v) {
-        this.value['for'] = [null, undefined].includes(v ? undefined : `${ v }s`);
+        this.value['for'] = [null, undefined].includes(v) ? undefined : `${ v }s`;
       }
     }
   },

package/edit/monitoring.coreos.com.prometheusrule/index.vue

@@ -113,7 +113,7 @@ export default {
     },
 
     updateGroupInterval(group, interval) {
-      group['interval'] = [null, undefined].includes(interval ? undefined : `${ interval }s`);
+      group['interval'] = [null, undefined].includes(interval) ? undefined : `${ interval }s`;
     },
 
     getGroupInterval(interval) {

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

@@ -128,6 +128,32 @@ describe('component: Advanced', () => {
 
         expect(checkbox.value).toBe('true');
       });
+
+      it(`should update agentConfig when 'protect-kernel-defaults' exists`, async() => {
+        const value = clone(PROV_CLUSTER);
+
+        value.spec.rkeConfig.machineGlobalConfig['protect-kernel-defaults'] = false;
+        value.spec.rkeConfig.machineSelectorConfig = [{
+          config:               { 'protect-kernel-defaults': true },
+          machineLabelSelector: {}
+        }];
+        value.agentConfig = value.spec.rkeConfig.machineSelectorConfig[0].config;
+
+        mountOptions.propsData.mode = _EDIT; // Use edit mode to allow interactions
+        mountOptions.propsData.value = value;
+
+        wrapper = mount(Advanced, mountOptions);
+
+        const checkboxLabel = wrapper
+          .find(`[data-testid="protect-kernel-defaults"]`)
+          .find('label');
+
+        checkboxLabel.trigger('click');
+        await wrapper.vm.$nextTick();
+
+        // Verify that agentConfig is updated
+        expect(value.spec.rkeConfig.machineSelectorConfig[0].config['protect-kernel-defaults']).toBe(false);
+      });
     });
 
     describe(`'kubelet-arg'`, () => {

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/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';
@@ -1483,7 +1484,8 @@ export default {
             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 }`;
 
           set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`, `${ distroRoot }/etc/config-files/cloud-provider-config`);
         }

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>