rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix agentConfig checkbox input (#12415)

This commit is contained in:
Jordon Leach 2024-10-30 06:24:02 -04:00 committed by GitHub
parent 34c74b8cc9
commit 27dce1ed68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shell/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts
View File

@ -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'`, () => {

8
shell/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue
View File

@ -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;
}
}
}
};