@rancher/shell 3.0.9-rc.5 → 3.0.9-rc.6

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

@@ -162,6 +162,12 @@ export default {
       class="edit-help"
     />
 
+    <Banner
+      v-if="setting.agent"
+      color="info"
+      :label="t('advancedSettings.edit.agentConfigBanner.text', { agent: t('advancedSettings.edit.agentConfigBanner.' + setting.agent) })"
+      data-testid="setting-agent-config-banner"
+    />
     <div class="edit-change mt-20">
       <h5 v-t="'advancedSettings.edit.changeSetting'" />
       <button

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

@@ -2,17 +2,20 @@ import { nextTick } from 'vue';
 import { mount } from '@vue/test-utils';
 import Basics from '@shell/edit/provisioning.cattle.io.cluster/tabs/Basics.vue';
 // import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+import { RKE2_INGRESS_NGINX, RKE2_TRAEFIK } from '@shell/edit/provisioning.cattle.io.cluster/shared';
 
 const defaultStubs = {
-  Banner:        true,
-  LabeledSelect: true,
-  YamlEditor:    true,
-  Checkbox:      true
+  Banner:          true,
+  LabeledSelect:   true,
+  YamlEditor:      true,
+  Checkbox:        true,
+  RichTranslation: true
 };
 
 const defaultCiliumStubs = {
-  LabeledSelect: true,
-  YamlEditor:    true,
+  LabeledSelect:   true,
+  YamlEditor:      true,
+  RichTranslation: true
 };
 
 // const defaultComputed = {
@@ -25,46 +28,65 @@ const defaultCiliumStubs = {
 // };
 
 const mockAgentArgs = { 'cloud-provider-name': { options: [], profile: { options: [{ anything: 'yes' }] } } };
-const mockServerArgs = { disable: {}, cni: { options: [] } };
-
+const mockServerArgs = { disable: { options: [] }, cni: { options: [] } };
+
+jest.mock('@shell/edit/provisioning.cattle.io.cluster/shared', () => ({
+  RETENTION_DEFAULT:         5,
+  RKE2_INGRESS_NGINX:        'rke2-ingress-nginx',
+  RKE2_TRAEFIK:              'rke2-traefik',
+  INGRESS_NGINX:             'ingress-nginx',
+  INGRESS_CONTROLLER:        'ingress-controller',
+  TRAEFIK:                   'traefik',
+  HARVESTER:                 'harvester',
+  INGRESS_DUAL:              'dual',
+  INGRESS_NONE:              'none',
+  INGRESS_OPTIONS:           [],
+  INGRESS_MIGRATION_KB_LINK: 'mock-link'
+}));
+const mockRke2Charts = {
+  [RKE2_INGRESS_NGINX]: {},
+  [RKE2_TRAEFIK]:       {},
+  'rke2-cilium':        {}
+};
+const mockK3sCharts = { 'rke2-cilium': {} };
 const rke2Versions = [
   {
-    id: 'v1.31.0+rke2r1', value: 'v1.31.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.31.0+rke2r1', value: 'v1.31.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   },
   {
-    id: 'v1.30.0+rke2r1', value: 'v1.30.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.30.0+rke2r1', value: 'v1.30.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   },
   {
-    id: 'v1.29.1+rke2r1', value: 'v1.29.1+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.29.1+rke2r1', value: 'v1.29.1+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   },
   {
-    id: 'v1.25.0+rke2r1', value: 'v1.25.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.25.0+rke2r1', value: 'v1.25.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   },
   {
-    id: 'v1.24.0+rke2r1', value: 'v1.24.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.24.0+rke2r1', value: 'v1.24.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   },
   {
-    id: 'v1.23.0+rke2r1', value: 'v1.23.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.23.0+rke2r1', value: 'v1.23.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockRke2Charts
   }
 ];
 const k3sVersions = [
   {
-    id: 'v1.31.0+k3s1', value: 'v1.31.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.31.0+k3s1', value: 'v1.31.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   },
   {
-    id: 'v1.30.0+k3s1', value: 'v1.30.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.30.0+k3s1', value: 'v1.30.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   },
   {
-    id: 'v1.29.1+k3s1', value: 'v1.29.1+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.29.1+k3s1', value: 'v1.29.1+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   },
   {
-    id: 'v1.25.0+k3s1', value: 'v1.25.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.25.0+k3s1', value: 'v1.25.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   },
   {
-    id: 'v1.24.0+k3s1', value: 'v1.24.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.24.0+k3s1', value: 'v1.24.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   },
   {
-    id: 'v1.23.0+k3s1', value: 'v1.23.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    id: 'v1.23.0+k3s1', value: 'v1.23.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: mockK3sCharts
   }
 ];
 const mockVersionOptions = [...rke2Versions, ...k3sVersions];
@@ -83,7 +105,7 @@ const defaultMocks = {
   $route: {
     name:  'anything',
     query: { AS: 'yaml' },
-  },
+  }
 };
 
 const defaultSpec = {
@@ -103,6 +125,9 @@ const bmOffValue = { bandwidthManager: { enabled: false } };
 function createBasicsTab(version : string, userChartValues: any, options = {}) {
   const k8s = mockVersionOptions.find((v) => v.id === version) || mockVersionOptions[0];
   const label = 'whatever';
+  const providedUserChartValues = userChartValues || {};
+  const providedVersionInfo = k8s.charts || {};
+
   const wrapper = mount(Basics, {
     props: {
       mode:  'create',
@@ -116,7 +141,8 @@ function createBasicsTab(version : string, userChartValues: any, options = {}) {
       },
       addonVersions:               [],
       provider:                    'custom',
-      userChartValues:             userChartValues || {},
+      userChartValues:             providedUserChartValues,
+      versionInfo:                 providedVersionInfo,
       cisOverride:                 false,
       cisPsaChangeBanner:          true,
       allPsas:                     [],
@@ -142,7 +168,6 @@ function createBasicsTab(version : string, userChartValues: any, options = {}) {
         ...defaultMocks,
         $store: { getters: defaultGetters },
       },
-
       stubs: defaultCiliumStubs,
     },
   });
@@ -176,6 +201,8 @@ describe('component: Basics', () => {
         },
         provider:                    'whatever',
         userChartValues:             {},
+        addonVersions:               [],
+        versionInfo:                 {},
         cisOverride:                 false,
         cisPsaChangeBanner:          true,
         allPsas:                     [],
@@ -228,6 +255,8 @@ describe('component: Basics', () => {
         },
         provider:                    'whatever',
         userChartValues:             {},
+        addonVersions:               [],
+        versionInfo:                 {},
         cisOverride:                 false,
         cisPsaChangeBanner:          true,
         allPsas:                     [],
@@ -277,6 +306,8 @@ describe('component: Basics', () => {
         },
         provider:           'custom',
         userChartValues:    {},
+        addonVersions:      [],
+        versionInfo:        {},
         cisPsaChangeBanner: true,
         allPsas:            [],
         cisOverride:        override,
@@ -284,7 +315,7 @@ describe('component: Basics', () => {
         versionOptions:     [{
           value:     k8s,
           agentArgs: { profile: { options: [cis] } },
-          charts:    {},
+          charts:    mockRke2Charts,
           profile:   { options: [cis] }
         }],
         isHarvesterDriver:           false,

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

@@ -1,4 +1,4 @@
-import { mount, shallowMount } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
 import Networking from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue';
 
 const mockServerArgs = { disable: {}, cni: { options: [] } };
@@ -47,34 +47,6 @@ describe('component: RKE2Networking', () => {
     expect(dropdown.props('options')).toHaveLength(3);
   });
 
-  it('should show an error when an ipv6 pool is present and the user selects the ipv4-only stack preference when creating a new cluster', async() => {
-    const spec = { ...defaultSpec, rkeConfig: { ...defaultSpec.rkeConfig, networking: { stackPreference: 'ipv4' } } };
-    const wrapper = mount(Networking, {
-      propsData: {
-        mode:             'create',
-        value:            { spec },
-        selectedVersion:  { serverArgs: mockServerArgs },
-        hasSomeIpv6Pools: true,
-      },
-      global: {
-        mocks: {
-          ...defaultMocks,
-          $store: { getters: defaultGetters },
-        },
-      },
-    });
-
-    expect(wrapper.emitted('validationChanged')?.[0]?.[0]).toBe(false);
-    expect(wrapper.emitted('validationChanged')).toHaveLength(1);
-
-    spec.rkeConfig.networking.stackPreference = 'ipv6';
-    wrapper.setProps({ value: { spec } });
-    await wrapper.vm.$nextTick();
-
-    expect(wrapper.emitted('validationChanged')?.[1]?.[0]).toBe(true);
-    expect(wrapper.emitted('validationChanged')).toHaveLength(2);
-  });
-
   it('should show a flannel masq input when provisioning k3s and flannel is enabled', () => {
     const spec = { ...defaultSpec } as any;
 
@@ -119,78 +91,4 @@ describe('component: RKE2Networking', () => {
     expect(wrapper.vm.showFlannelMasq).toBe(false);
     expect(input.exists()).toBe(false);
   });
-
-  it('should automatically check the flannel masq input when stack preference is changed from ipv4 to ipv6 or dual', async() => {
-    const spec = { ...defaultSpec } as any;
-
-    spec.rkeConfig.networking.stackPreference = 'ipv4';
-
-    const wrapper = shallowMount(Networking, {
-      propsData: {
-        mode:            'create',
-        value:           { spec },
-        selectedVersion: { serverArgs: mockServerArgs, label: 'k3s' },
-      },
-      global: { mocks: {} }
-    });
-
-    const newSpec = { ...spec };
-
-    newSpec.rkeConfig.networking.stackPreference = 'dual';
-
-    await wrapper.setProps({ value: { spec: newSpec } });
-
-    expect(wrapper.emitted('enable-flannel-masq-changed')?.[0]?.[0]).toBe(true);
-  });
-
-  it('should automatically un-check the flannel masq input when stack preference is changed from ipv6 or dual to ipv4', async() => {
-    const spec = { ...defaultSpec } as any;
-
-    spec.rkeConfig.networking.stackPreference = 'ipv6';
-
-    const wrapper = shallowMount(Networking, {
-      propsData: {
-        mode:            'create',
-        value:           { spec },
-        selectedVersion: { serverArgs: mockServerArgs, label: 'k3s' },
-      },
-      global: {
-        mocks: {
-          ...defaultMocks,
-          $store: { getters: defaultGetters },
-        },
-      },
-    });
-
-    const newSpec = { ...spec };
-
-    newSpec.rkeConfig.networking.stackPreference = 'ipv4';
-
-    await wrapper.setProps({ value: { spec: newSpec } });
-
-    expect(wrapper.emitted('enable-flannel-masq-changed')?.[0]?.[0]).toBe(false);
-  });
-
-  it('should not automatically update stack preference or validate it when editing an existing cluster even if its set to ipv4 and the user appears to have ipv6 pools', async() => {
-    const spec = { ...defaultSpec, rkeConfig: { ...defaultSpec.rkeConfig, networking: { stackPreference: 'ipv4' } } };
-    const wrapper = mount(Networking, {
-      propsData: {
-        mode:             'edit',
-        value:            { spec },
-        selectedVersion:  { serverArgs: mockServerArgs },
-        hasSomeIpv6Pools: true,
-      },
-      global: {
-        mocks: {
-          ...defaultMocks,
-          $store: { getters: defaultGetters },
-        },
-      },
-    });
-
-    await wrapper.vm.$nextTick();
-
-    expect(wrapper.emitted('validationChanged')?.[0]?.[0]).toBe(true);
-    expect(wrapper.emitted('stack-preference-changed')).toBeUndefined();
-  });
 });

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

@@ -1,7 +1,19 @@
 import { shallowMount } from '@vue/test-utils';
 import { createStore } from 'vuex';
 import ClusterCreate from '@shell/edit/provisioning.cattle.io.cluster/index.vue';
-
+jest.mock('@shell/edit/provisioning.cattle.io.cluster/shared', () => ({
+  RETENTION_DEFAULT:         5,
+  RKE2_INGRESS_NGINX:        'rke2-ingress-nginx',
+  RKE2_TRAEFIK:              'rke2-traefik',
+  INGRESS_NGINX:             'ingress-nginx',
+  INGRESS_CONTROLLER:        'ingress-controller',
+  TRAEFIK:                   'traefik',
+  HARVESTER:                 'harvester',
+  INGRESS_DUAL:              'dual',
+  INGRESS_NONE:              'none',
+  INGRESS_OPTIONS:           [],
+  INGRESS_MIGRATION_KB_LINK: 'mock-link'
+}));
 describe('component: Cluster: Create', () => {
   it('should hide RKE1 and RKE2 toggle button if RKE1 ui feature flag is NOT set', () => {
     const store = createStore({

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

@@ -0,0 +1,283 @@
+import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+import RKE2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
+import { AGENT_CONFIGURATION_TYPES } from '@shell/config/settings';
+
+jest.mock('@shell/edit/provisioning.cattle.io.cluster/shared', () => ({
+  RETENTION_DEFAULT:         5,
+  RKE2_INGRESS_NGINX:        'rke2-ingress-nginx',
+  RKE2_TRAEFIK:              'rke2-traefik',
+  INGRESS_NGINX:             'ingress-nginx',
+  INGRESS_CONTROLLER:        'ingress-controller',
+  TRAEFIK:                   'traefik',
+  HARVESTER:                 'harvester',
+  INGRESS_DUAL:              'dual',
+  INGRESS_NONE:              'none',
+  INGRESS_OPTIONS:           [],
+  INGRESS_MIGRATION_KB_LINK: 'mock-link'
+}));
+const mockStore = {
+  getters: {
+    'management/schemaFor':            jest.fn().mockReturnValue(null),
+    'management/byId':                 jest.fn().mockReturnValue({}),
+    'management/canList':              jest.fn().mockReturnValue(true),
+    'management/all':                  jest.fn().mockReturnValue([]),
+    'rancher/all':                     jest.fn().mockReturnValue([]),
+    'rancher/byId':                    jest.fn().mockReturnValue({}),
+    'i18n/t':                          jest.fn().mockImplementation((key) => key),
+    'i18n/withFallback':               jest.fn().mockImplementation((key) => key),
+    'features/get':                    jest.fn().mockReturnValue(() => true),
+    'plugins/cloudProviderForDriver':  jest.fn().mockReturnValue(undefined),
+    currentCluster:                    {},
+    'customisation/getPreviewCluster': {
+      badge: {
+        iconText: '', color: '', text: ''
+      }
+    },
+    productId:    'rancher',
+    currentStore: jest.fn().mockReturnValue('management')
+  },
+  dispatch: jest.fn().mockResolvedValue({ data: [] })
+};
+
+const mockRoute = {
+  query: {},
+  name:  'test'
+};
+
+const mockValue = {
+  metadata: {
+    name:        'test-cluster',
+    annotations: {}
+  },
+  spec: {
+    kubernetesVersion: 'v1.25.0+rke2r1',
+    rkeConfig:         {
+      machineGlobalConfig:   {},
+      networking:            { stackPreference: 'ipv4' },
+      machineSelectorConfig: [{ config: {} }],
+      dataDirectories:       {}
+    },
+    clusterAgentDeploymentCustomization: {},
+    fleetAgentDeploymentCustomization:   {}
+  },
+  agentConfig: {}
+};
+
+const createWrapper = (propsData: any = {}) => {
+  return shallowMount(RKE2, {
+    propsData: {
+      mode:     'create',
+      value:    { ...mockValue, ...propsData.value },
+      provider: 'custom',
+      ...propsData
+    },
+    global: {
+      mocks: {
+        $store:      mockStore,
+        $route:      mockRoute,
+        $router:     { replace: jest.fn() },
+        t:           jest.fn().mockImplementation((key) => key),
+        $extension:  { getDynamic: jest.fn().mockReturnValue(undefined) },
+        $fetchState: { pending: false, error: null }
+      }
+    },
+    data() {
+      return {
+        loadedOnce:   true,
+        rke2Versions: null,
+        k3sVersions:  null,
+        defaultRke2:  'v1.25.0+rke2r1',
+        defaultK3s:   'v1.25.0+k3s1'
+      } as any;
+    }
+  });
+};
+
+describe('component: RKE2 - Fleet Agent Configuration', () => {
+  let wrapper: any;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    wrapper = createWrapper();
+  });
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.unmount();
+    }
+  });
+
+  describe('fleet Agent Scheduling Customization', () => {
+    beforeEach(async() => {
+      // Initialize the component with fleet agent defaults
+      wrapper.vm.fleetAgentDefaultPC = { value: 100, preemptionPolicy: 'PreemptLowerPriority' };
+      wrapper.vm.fleetAgentDefaultPDB = { maxUnavailable: 1 };
+      wrapper.vm.schedulingCustomizationFeatureEnabled = true;
+      await nextTick();
+    });
+
+    it('should enable Fleet Agent scheduling customization when event is true', async() => {
+      const event = { event: true, agentType: AGENT_CONFIGURATION_TYPES.FLEET };
+
+      wrapper.vm.setSchedulingCustomization(event);
+
+      expect(wrapper.vm.value.spec.fleetAgentDeploymentCustomization.schedulingCustomization).toStrictEqual({
+        priorityClass:       wrapper.vm.fleetAgentDefaultPC,
+        podDisruptionBudget: wrapper.vm.fleetAgentDefaultPDB
+      });
+    });
+
+    it('should disable Fleet Agent scheduling customization when event is false', async() => {
+      // First enable it
+      const enableEvent = { event: true, agentType: AGENT_CONFIGURATION_TYPES.FLEET };
+
+      wrapper.vm.setSchedulingCustomization(enableEvent);
+
+      // Then disable it
+      const disableEvent = { event: false, agentType: AGENT_CONFIGURATION_TYPES.FLEET };
+
+      wrapper.vm.setSchedulingCustomization(disableEvent);
+
+      expect(wrapper.vm.value.spec.fleetAgentDeploymentCustomization.schedulingCustomization).toBeUndefined();
+    });
+
+    it('should enable Cluster Agent scheduling customization when event is true', async() => {
+      // Initialize cluster agent defaults
+      wrapper.vm.clusterAgentDefaultPC = { value: 200, preemptionPolicy: 'PreemptLowerPriority' };
+      wrapper.vm.clusterAgentDefaultPDB = { maxUnavailable: 2 };
+
+      const event = { event: true, agentType: AGENT_CONFIGURATION_TYPES.CLUSTER };
+
+      wrapper.vm.setSchedulingCustomization(event);
+
+      expect(wrapper.vm.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization).toStrictEqual({
+        priorityClass:       wrapper.vm.clusterAgentDefaultPC,
+        podDisruptionBudget: wrapper.vm.clusterAgentDefaultPDB
+      });
+    });
+
+    it('should disable Cluster Agent scheduling customization when event is false', async() => {
+      // Initialize cluster agent defaults
+      wrapper.vm.clusterAgentDefaultPC = { value: 200, preemptionPolicy: 'PreemptLowerPriority' };
+      wrapper.vm.clusterAgentDefaultPDB = { maxUnavailable: 2 };
+
+      // First enable it
+      const enableEvent = { event: true, agentType: AGENT_CONFIGURATION_TYPES.CLUSTER };
+
+      wrapper.vm.setSchedulingCustomization(enableEvent);
+
+      // Then disable it
+      const disableEvent = { event: false, agentType: AGENT_CONFIGURATION_TYPES.CLUSTER };
+
+      wrapper.vm.setSchedulingCustomization(disableEvent);
+
+      expect(wrapper.vm.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization).toBeUndefined();
+    });
+
+    it('should handle unknown agent types gracefully', async() => {
+      const event = { event: true, agentType: 'unknown' };
+
+      // Should not throw an error
+      expect(() => wrapper.vm.setSchedulingCustomization(event)).not.toThrow();
+
+      // Should not modify any agent configuration
+      expect(wrapper.vm.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization).toBeUndefined();
+      expect(wrapper.vm.value.spec.fleetAgentDeploymentCustomization.schedulingCustomization).toBeUndefined();
+    });
+
+    it('should pass the correct agent type to SchedulingCustomization components', async() => {
+      await wrapper.vm.$nextTick();
+
+      // Check if AGENT_CONFIGURATION_TYPES is available in the component data
+      expect(wrapper.vm.AGENT_CONFIGURATION_TYPES).toBeDefined();
+      expect(wrapper.vm.AGENT_CONFIGURATION_TYPES.CLUSTER).toBe('cluster');
+      expect(wrapper.vm.AGENT_CONFIGURATION_TYPES.FLEET).toBe('fleet');
+    });
+  });
+
+  describe('fleet Agent Configuration Data Initialization', () => {
+    it('should initialize fleet agent default configuration properties', () => {
+      expect(wrapper.vm.fleetAgentDefaultPC).toBeDefined();
+      expect(wrapper.vm.fleetAgentDefaultPDB).toBeDefined();
+      expect(wrapper.vm.AGENT_CONFIGURATION_TYPES).toBeDefined();
+    });
+
+    it('should have AGENT_CONFIGURATION_TYPES with correct values', () => {
+      expect(wrapper.vm.AGENT_CONFIGURATION_TYPES).toStrictEqual({
+        CLUSTER: 'cluster',
+        FLEET:   'fleet'
+      });
+    });
+  });
+
+  describe('fleet Agent Configuration Template', () => {
+    it('should render AgentConfiguration for fleet agent with correct props', async() => {
+      // Set up fleet agent configuration to ensure it renders
+      wrapper.vm.value.spec.fleetAgentDeploymentCustomization = {};
+      wrapper.vm.schedulingCustomizationFeatureEnabled = true;
+      wrapper.vm.fleetAgentDefaultPC = { value: 100 };
+      wrapper.vm.fleetAgentDefaultPDB = { maxUnavailable: 1 };
+      await nextTick();
+
+      // Force re-render
+      await wrapper.vm.$forceUpdate();
+      await nextTick();
+
+      // The template should contain fleet agent configuration
+      // This tests the template structure even if the component isn't fully mounted
+      expect(wrapper.vm.value.spec.fleetAgentDeploymentCustomization).toBeDefined();
+    });
+  });
+
+  describe('flannel Masquerade Configuration', () => {
+    let k3sWrapper: any;
+
+    beforeEach(() => {
+      const k3sValue = {
+        ...mockValue,
+        spec: {
+          ...mockValue.spec,
+          rkeConfig: {
+            ...mockValue.spec.rkeConfig,
+            machineGlobalConfig: { 'flannel-backend': 'vxlan' } // flannel enabled
+          }
+        }
+      };
+
+      k3sWrapper = createWrapper({ value: k3sValue });
+    });
+
+    afterEach(() => {
+      if (k3sWrapper) {
+        k3sWrapper.unmount();
+      }
+    });
+
+    it('should handle flannel masquerade configuration change', async() => {
+      k3sWrapper.vm.handleFlannelMasqChanged(true);
+
+      expect(k3sWrapper.vm.serverConfig['flannel-ipv6-masq']).toBe(true);
+    });
+
+    it('should remove flannel masquerade configuration when set to false', async() => {
+      // First set it to true
+      k3sWrapper.vm.handleFlannelMasqChanged(true);
+      expect(k3sWrapper.vm.serverConfig['flannel-ipv6-masq']).toBe(true);
+
+      // Then set it to false
+      k3sWrapper.vm.handleFlannelMasqChanged(false);
+      expect(k3sWrapper.vm.serverConfig['flannel-ipv6-masq']).toBe(false);
+    });
+
+    it('should remove flannel masquerade configuration when set to null/undefined', async() => {
+      // First set it to true
+      k3sWrapper.vm.handleFlannelMasqChanged(true);
+      expect(k3sWrapper.vm.serverConfig['flannel-ipv6-masq']).toBe(true);
+
+      // Then set it to null
+      k3sWrapper.vm.handleFlannelMasqChanged(null);
+      expect(k3sWrapper.vm.serverConfig['flannel-ipv6-masq']).toBeUndefined();
+    });
+  });
+});