@rancher/shell 0.4.0 → 0.5.1

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

@@ -0,0 +1,473 @@
+import { mount } from '@vue/test-utils';
+import Basics from '@shell/edit/provisioning.cattle.io.cluster/tabs/Basics';
+import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
+
+const defaultStubs = {
+  Banner:        true,
+  LabeledSelect: true,
+  YamlEditor:    true,
+  Checkbox:      true
+};
+
+const defaultCiliumStubs = {
+  Banner:        true,
+  LabeledSelect: true,
+  YamlEditor:    true,
+};
+
+const defaultComputed = {
+  showk8s21LegacyWarning() {
+    return false;
+  },
+  profileOptions() {
+    return [{ label: 'anything', value: 'anything' }];
+  }
+};
+
+const mockAgentArgs = { 'cloud-provider-name': { options: [], profile: { options: [{ anything: 'yes' }] } } };
+const mockServerArgs = { disable: {}, cni: { options: [] } };
+
+const rke2Versions =
+  [
+    {
+      id: 'v1.25.0+rke2r1', value: 'v1.25.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    },
+    {
+      id: 'v1.24.0+rke2r1', value: 'v1.24.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    },
+    {
+      id: 'v1.23.0+rke2r1', value: 'v1.23.0+rke2r1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+    }
+  ];
+const k3sVersions = [
+  {
+    id: 'v1.25.0+k3s1', value: 'v1.25.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+  },
+  {
+    id: 'v1.24.0+k3s1', value: 'v1.24.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+  },
+  {
+    id: 'v1.23.0+k3s1', value: 'v1.23.0+k3s1', serverArgs: mockServerArgs, agentArgs: mockAgentArgs, charts: {}
+  }
+];
+const mockVersionOptions = [...rke2Versions, ...k3sVersions];
+
+const defaultGetters = {
+  currentStore:                     () => 'current_store',
+  'management/schemaFor':           jest.fn(),
+  'current_store/all':              jest.fn(),
+  'i18n/t':                         jest.fn(),
+  'i18n/withFallback':              jest.fn(),
+  'plugins/cloudProviderForDriver': jest.fn()
+};
+
+const defaultMocks = {
+  $route: {
+    name:  'anything',
+    query: { AS: 'yaml' },
+  },
+};
+
+const defaultSpec = {
+  rkeConfig:   { etcd: { disableSnapshots: false }, machineGlobalConfig: { cni: 'calico' } },
+  chartValues: {},
+};
+
+const defaultCiliumSpec = {
+  rkeConfig:   { etcd: { disableSnapshots: false }, machineGlobalConfig: { cni: 'cilium' } },
+  chartValues: {},
+};
+
+// ipv6
+const legacyOnValue = { cilium: { ipv6: { enabled: true } } };
+const legacyOffValue = { cilium: { ipv6: { enabled: false } } };
+const newOnValue = { ipv6: { enabled: true } };
+const newOffValue = { ipv6: { enabled: false } };
+
+// bandwidth manager
+const bmOnValue = { bandwidthManager: { enabled: true } };
+const bmOffValue = { bandwidthManager: { enabled: false } };
+
+function createBasicsTab(version : string, userChartValues: any) {
+  const k8s = mockVersionOptions.find((v) => v.id === version) || mockVersionOptions[0];
+  const label = 'whatever';
+  const wrapper = mount(Basics, {
+    propsData: {
+      mode:  'create',
+      value: {
+        spec: {
+          ...defaultCiliumSpec,
+          defaultPodSecurityAdmissionConfigurationTemplateName: label,
+          kubernetesVersion:                                    k8s.value
+        },
+        agentConfig: { 'cloud-provider-name': '' },
+      },
+      addonVersions:               [],
+      provider:                    'custom',
+      userChartValues:             userChartValues || {},
+      cisOverride:                 false,
+      cisPsaChangeBanner:          true,
+      allPsas:                     [],
+      selectedVersion:             k8s,
+      versionOptions:              mockVersionOptions,
+      isHarvesterDriver:           false,
+      isHarvesterIncompatible:     false,
+      showDeprecatedPatchVersions: false,
+      clusterIsAlreadyCreated:     false,
+      isElementalCluster:          false,
+      hasPsaTemplates:             false,
+      isK3s:                       false,
+      haveArgInfo:                 false,
+      showCni:                     true,
+      showCloudProvider:           false,
+      unsupportedCloudProvider:    false,
+      cloudProviderOptions:        [{ label: 'Default - RKE2 Embedded', value: '' }],
+    },
+    computed: defaultComputed,
+    mocks:    {
+      ...defaultMocks,
+      $store: { getters: defaultGetters },
+    },
+    stubs: defaultCiliumStubs
+  });
+
+  return wrapper;
+}
+
+describe('component: Basics', () => {
+  /**
+   * DISCLAIMER ***************************************************************************************
+   * Logs are prevented to avoid polluting the test output.
+   ****************************************************************************************************
+  */
+  // eslint-disable-next-line jest/no-hooks
+  beforeEach(() => {
+    jest.spyOn(console, 'log').mockImplementation(() => { });
+  });
+
+  it.each(mockVersionOptions)('should display PSA option', (k8s) => {
+    const label = 'whatever';
+    const wrapper = mount(Basics, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    k8s.value
+          },
+          agentConfig: { 'cloud-provider-name': '' },
+        },
+        provider:                    'whatever',
+        userChartValues:             {},
+        cisOverride:                 false,
+        cisPsaChangeBanner:          true,
+        allPsas:                     [],
+        selectedVersion:             k8s,
+        versionOptions:              mockVersionOptions,
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             false,
+        haveArgInfo:                 false,
+        showCni:                     true,
+        showCloudProvider:           true,
+        unsupportedCloudProvider:    false,
+        cloudProviderOptions:        [{ label: 'Default - RKE2 Embedded', value: '' }],
+      },
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).options[0].label).toBe(`${ label } (Current)`);
+  });
+
+  it.each([
+    ['v1.25.0+rke2r1', 'none'],
+    ['v1.24.0+rke2r1', 'default'],
+    ['v1.23.0+rke2r1', 'default'],
+    ['v1.25.0+k3s1', 'none'],
+    ['v1.24.0+k3s1', 'default'],
+    ['v1.23.0+k3s1', 'default'],
+  ])('should display for version %p PSA option label %p', (k8s, partialLabel) => {
+    const label = `cluster.rke2.defaultPodSecurityAdmissionConfigurationTemplateName.option.${ partialLabel }`;
+    const wrapper = mount(Basics, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    k8s
+          },
+          agentConfig: { 'cloud-provider-name': '' },
+        },
+        provider:                    'whatever',
+        userChartValues:             {},
+        cisOverride:                 false,
+        cisPsaChangeBanner:          true,
+        allPsas:                     [],
+        selectedVersion:             mockVersionOptions[0],
+        versionOptions:              mockVersionOptions,
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             false,
+        haveArgInfo:                 false,
+        showCni:                     true,
+        showCloudProvider:           true,
+        unsupportedCloudProvider:    false,
+        cloudProviderOptions:        [{ label: 'Default - RKE2 Embedded', value: '' }],
+      },
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).options[0].label).toStrictEqual(`${ label } (Current)`);
+  });
+
+  it.each([
+    ['anything', false, true],
+    ['', false, false],
+    ['', true, false],
+  ])('given CIS value as %p and its override as %p, it should set PSA dropdown as disabled %p', (cis, override, disabled) => {
+    const label = 'whatever';
+    const k8s = 'v1.25.0+rke2r1';
+    const wrapper = mount(Basics, {
+      propsData: {
+        mode:  'create',
+        value: {
+          agentConfig: { profile: cis, 'cloud-provider-name': '' },
+          spec:        {
+            ...defaultSpec,
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    k8s
+          }
+        },
+        provider:           'custom',
+        userChartValues:    {},
+        cisPsaChangeBanner: true,
+        allPsas:            [],
+        cisOverride:        override,
+        selectedVersion:    mockVersionOptions[0],
+        versionOptions:     [{
+          value:     k8s,
+          agentArgs: { profile: { options: [cis] } },
+          charts:    {},
+          profile:   { options: [cis] }
+        }],
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             true,
+        haveArgInfo:                 false,
+        showCni:                     true,
+        showCloudProvider:           true,
+        unsupportedCloudProvider:    false,
+        cloudProviderOptions:        [{ label: 'Default - RKE2 Embedded', value: '' }],
+      },
+      computed: { ...defaultComputed },
+      mocks:    {
+        ...defaultMocks,
+        $store: { getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).disabled).toBe(disabled);
+  });
+
+  describe('cilium CNI', () => {
+    it('should toggle ipv6 on/off with the legacy structure', async() => {
+      const wrapper = createBasicsTab('v1.23.0+rke2r1', {});
+      const ipv6Checkbox = wrapper.find('[data-testid="cluster-rke2-cni-ipv6-checkbox"]');
+
+      expect(ipv6Checkbox.exists()).toBe(true);
+      expect(ipv6Checkbox.isVisible()).toBe(true);
+
+      // Click the checkbox - should enable ipv6
+      await ipv6Checkbox.find('label').trigger('click');
+      await ipv6Checkbox.vm.$nextTick();
+      await wrapper.vm.$nextTick();
+
+      // Check and update user values with the emitted value
+      let latest = (wrapper.emitted()['cilium-values-changed'] || [])[0][0];
+
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(legacyOnValue));
+
+      await wrapper.setProps({ userChartValues: { 'rke2-cilium': latest } });
+
+      // Click the checkbox to turn ipv6 off again
+      await ipv6Checkbox.find('label').trigger('click');
+      await ipv6Checkbox.vm.$nextTick();
+      await wrapper.vm.$nextTick();
+
+      // Update from the emitted value
+      latest = (wrapper.emitted()['cilium-values-changed'] || [])[1][0];
+
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(legacyOffValue));
+    });
+
+    it('should toggle ipv6 on/off with the new structure', async() => {
+      const wrapper = createBasicsTab('v1.25.0+rke2r1', {});
+      const ipv6Checkbox = wrapper.find('[data-testid="cluster-rke2-cni-ipv6-checkbox"]');
+
+      expect(ipv6Checkbox.exists()).toBe(true);
+      expect(ipv6Checkbox.isVisible()).toBe(true);
+
+      // Click the checkbox - should enable ipv6
+      await ipv6Checkbox.find('label').trigger('click');
+      await ipv6Checkbox.vm.$nextTick();
+      await wrapper.vm.$nextTick();
+
+      // Check and update user values with the emitted value
+      let latest = (wrapper.emitted()['cilium-values-changed'] || [])[0][0];
+
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(newOnValue));
+
+      await wrapper.setProps({ userChartValues: { 'rke2-cilium': latest } });
+
+      // Click the checkbox to turn ipv6 off again
+      await ipv6Checkbox.find('label').trigger('click');
+      await ipv6Checkbox.vm.$nextTick();
+      await wrapper.vm.$nextTick();
+
+      // Update from the emitted value
+      latest = (wrapper.emitted()['cilium-values-changed'] || [])[1][0];
+
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(newOffValue));
+    });
+
+    it('should migrate when the k8s version is changed', async() => {
+      const userChartValues = { 'rke2-cilium': { ipv6: { enabled: true } } };
+      const wrapper = createBasicsTab('v1.25.0+rke2r1', userChartValues);
+
+      // Check that the checkbox is checked
+      const ipv6Checkbox = wrapper.find('[data-testid="cluster-rke2-cni-ipv6-checkbox"]') as Checkbox;
+
+      expect(ipv6Checkbox.exists()).toBe(true);
+      expect(ipv6Checkbox.isVisible()).toBe(true);
+      expect(ipv6Checkbox.vm.value).toBe(true);
+
+      // Change the kubernetes version that needs the legacy format
+      const k8s123 = mockVersionOptions.find((v) => v.id === 'v1.23.0+rke2r1');
+
+      await wrapper.setProps({ selectedVersion: k8s123 });
+
+      let latest = (wrapper.emitted()['cilium-values-changed'] || [])[0][0];
+
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(legacyOnValue));
+
+      // Change back the version so that the new format should be used
+      const k8s125 = mockVersionOptions.find((v) => v.id === 'v1.25.0+rke2r1');
+
+      await wrapper.setProps({ selectedVersion: k8s125 });
+
+      latest = (wrapper.emitted()['cilium-values-changed'] || [])[1][0];
+      expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(newOnValue));
+    });
+  });
+
+  it('should toggle bandwidth manager support on/off', async() => {
+    const wrapper = createBasicsTab('v1.25.0+rke2r1', {});
+    const bmCheckbox = wrapper.find('[data-testid="cluster-rke2-cni-cilium-bandwidth-manager-checkbox"]');
+
+    expect(bmCheckbox.exists()).toBe(true);
+    expect(bmCheckbox.isVisible()).toBe(true);
+
+    // Click the checkbox - should enable bandwidth manager
+    await bmCheckbox.find('label').trigger('click');
+    await bmCheckbox.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    // Check and update user values with the emitted value
+    let latest = (wrapper.emitted()['cilium-values-changed'] || [])[0][0];
+
+    expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(bmOnValue));
+
+    await wrapper.setProps({ userChartValues: { 'rke2-cilium': latest } });
+
+    // Click the checkbox to turn ipv6 off again
+    await bmCheckbox.find('label').trigger('click');
+    await bmCheckbox.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    // Update from the emitted value
+    latest = (wrapper.emitted()['cilium-values-changed'] || [])[1][0];
+
+    expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(bmOffValue));
+  });
+
+  it('should support ipv6 and bandwidth manager', async() => {
+    const wrapper = createBasicsTab('v1.25.0+rke2r1', {});
+    const bmCheckbox = wrapper.find('[data-testid="cluster-rke2-cni-cilium-bandwidth-manager-checkbox"]');
+    const ipv6Checkbox = wrapper.find('[data-testid="cluster-rke2-cni-ipv6-checkbox"]');
+
+    // Click the checkbox - should enable bandwidth manager
+    await bmCheckbox.find('label').trigger('click');
+    await bmCheckbox.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    let latest = (wrapper.emitted()['cilium-values-changed'] || [])[0][0];
+
+    await wrapper.setProps({ userChartValues: { 'rke2-cilium': latest } });
+
+    // Click the checkbox - should enable ipv6
+    await ipv6Checkbox.find('label').trigger('click');
+    await ipv6Checkbox.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    // Check and update user values with the emitted value
+    latest = (wrapper.emitted()['cilium-values-changed'] || [])[1][0];
+
+    const combined = {
+      bandwidthManager: { enabled: true },
+      ipv6:             { enabled: true }
+    };
+
+    expect(JSON.stringify(latest)).toStrictEqual(JSON.stringify(combined));
+
+    // Check that other properties are preserved
+    latest = {
+      ...latest,
+      bandwidthManager: {
+        test:    true,
+        enabled: false
+      },
+      ipv6: {
+        test:    true,
+        enabled: false
+      }
+    };
+
+    await wrapper.setProps({ userChartValues: { 'rke2-cilium': latest } });
+
+    // Click the checkbox to turn bandwidth manager off again
+    await bmCheckbox.find('label').trigger('click');
+    await bmCheckbox.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    latest = (wrapper.emitted()['cilium-values-changed'] || [])[2][0];
+
+    const expected = '{"bandwidthManager":{"test":true,"enabled":true},"ipv6":{"test":true,"enabled":false}}';
+
+    expect(JSON.stringify(latest)).toStrictEqual(expected);
+  });
+});

package/edit/provisioning.cattle.io.cluster/__tests__/{CustomCommand.tests.ts → CustomCommand.test.ts}

@@ -1,8 +1,10 @@
 import { mount } from '@vue/test-utils';
 import CustomCommand from '@shell/edit/provisioning.cattle.io.cluster/CustomCommand.vue';
+import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 jest.mock('@shell/utils/clipboard', () => {
   return { copyTextToClipboard: jest.fn(() => Promise.resolve({})) };
 });
+
 describe('component: CustomCommand', () => {
   const token = 'MY_TOKEN';
   const ip = 'MY_IP';
@@ -37,6 +39,8 @@ describe('component: CustomCommand', () => {
       taints:          [],
       worker:          true,
     }),
+
+    directives: { cleanHtmlDirective }
   });
 
   it('should return linux commands with the right flags based on cluster information', () => {

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

@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import DrainOptions from '@shell/edit/provisioning.cattle.io.cluster/DrainOptions.vue';
+import DrainOptions from '@shell/edit/provisioning.cattle.io.cluster/tabs/upgrade/DrainOptions';
 import { DefaultProps } from 'vue/types/options';
 import { ExtendedVue, Vue } from 'vue/types/vue';
 

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

@@ -0,0 +1,73 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import ClusterCreate from '@shell/edit/provisioning.cattle.io.cluster/index.vue';
+
+describe('component: Cluster: Create', () => {
+  it('should hide RKE1 and RKE2 toggle button if RKE1 ui feature flag is NOT set', () => {
+    const localVue = createLocalVue();
+
+    localVue.use(Vuex);
+
+    const store = new Vuex.Store({
+      modules: {
+        i18n: {
+          namespaced: true,
+          getters:    {
+            t:            jest.fn(),
+            withFallback: () => jest.fn(),
+          }
+        },
+        features: {
+          namespaced: true,
+          getters:    {
+            get:          () => jest.fn(),
+            withFallback: jest.fn(),
+          }
+        },
+        prefs: {
+          namespaced: true,
+          getters:    { get: jest.fn() }
+        },
+        mapFeature: {
+          namespaced: true,
+          getters:    { get: jest.fn() }
+        },
+        'type-map': {
+          namespaced: true,
+          getters:    { activeProducts: () => [] }
+        },
+        catalog: {
+          namespaced: true,
+          getters:    { charts: () => [] }
+        }
+      },
+      getters: {
+        defaultClusterId: jest.fn(),
+        clusterId:        jest.fn()
+      }
+    });
+
+    const wrapper = shallowMount(ClusterCreate, {
+      computed:  { rke1UiEnabled: () => false },
+      propsData: {
+        value:           { metadata: {}, spec: { template: {} } },
+        realMode:        '',
+        mode:            'edit',
+        componentTestid: 'cluster-manager-create',
+      },
+      mixins: [],
+      store,
+      localVue,
+      mocks:  {
+        $route:      { params: {}, query: {} },
+        $router:     { applyQuery: jest.fn() },
+        $fetchState: { pending: false },
+      },
+      stubs: { CruResource: { template: '<div><slot name="subtypes"></slot></div>' } }
+    });
+
+    const element = wrapper.find('[data-testid="cluster-manager-create-rke-switch"]').element;
+
+    expect(element).not.toBeDefined();
+  });
+});

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

@@ -39,7 +39,13 @@ const defaultStubs = {
   UnitInput:                true,
   YamlEditor:               true,
   MemberRoles:              true,
-  Basics:                   true
+  Basics:                   true,
+  Etcd:                     true,
+  Networking:               true,
+  Upgrade:                  true,
+  Registries:               true,
+  AddOnConfig:              true,
+  Advanced:                 true
 };
 
 const mockAgentArgs = { 'cloud-provider-name': { options: [], profile: { options: [{ anything: 'yes' }] } } };