@rancher/shell 2.0.1 → 2.0.2

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

@@ -33,39 +33,15 @@ describe('component: DirectoryConfig', () => {
     );
 
     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
-    );
 
-    const inputPath = 'some-data-dir';
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
-
-    commonInput.setValue(inputPath);
-    await wrapper.vm.$nextTick();
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
+    expect(systemAgentInput.exists()).toBe(true);
+    expect(provisioningInput.exists()).toBe(true);
+    expect(k8sDistroInput.exists()).toBe(true);
   });
 
   it('updating each individual data dir should set the correct values on each data dir variable', async() => {
@@ -75,13 +51,6 @@ describe('component: DirectoryConfig', () => {
     );
 
     const inputPath = 'some-data-dir';
-    const checkbox = wrapper.find('[data-testid="rke2-directory-config-individual-config-checkbox"]');
-
-    await checkbox.find('label').trigger('click');
-    await checkbox.vm.$nextTick();
-    await wrapper.vm.$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"]');
@@ -97,101 +66,6 @@ describe('component: DirectoryConfig', () => {
     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
-    );
-
-    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);
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(inputPath);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(inputPath);
-  });
-
-  it('checkbox should NOT be checked if some data dir values are the different (with all data dir values filled)', () => {
-    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;
-
-    wrapper = mount(
-      DirectoryConfig,
-      newMountOptions
-    );
-
-    expect(wrapper.vm.isSettingCommonConfig).toBe(false);
-
-    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(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
-    );
-
-    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(checkbox.exists()).toBe(true);
-    expect(commonInput.exists()).toBe(true);
-    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('disabled');
-  });
-
   it('on a mode different than _CREATE all visible inputs should be disabled (with different values)', () => {
     const newMountOptions = clone(mountOptions);
     const inputPath1 = 'some-data-dir1';
@@ -208,19 +82,14 @@ 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"]');
     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(checkbox.find('label').classes('disabled')).toBe(true);
     expect(systemAgentInput.attributes('disabled')).toBe('disabled');
     expect(provisioningInput.attributes('disabled')).toBe('disabled');
     expect(k8sDistroInput.attributes('disabled')).toBe('disabled');

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

@@ -22,6 +22,7 @@ const defaultStubs = {
   BadgeState:               true,
   Checkbox:                 true,
   ClusterMembershipEditor:  true,
+  ClusterAppearance:        true,
   DrainOptions:             true,
   LabeledInput:             true,
   Labels:                   true,
@@ -53,11 +54,23 @@ const defaultStubs = {
 const mockAgentArgs = { 'cloud-provider-name': { options: [], profile: { options: [{ anything: 'yes' }] } } };
 
 const defaultComputed = {
+  appsOSWarning() {
+    return false;
+  },
   showForm() {
     return true;
   },
   versionOptions() {
     return [
+      {
+        id: 'v1.31.0+rke2r1', value: 'v1.31.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
+      {
+        id: 'v1.30.0+rke2r1', value: 'v1.30.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
+      {
+        id: 'v1.29.1+rke2r1', value: 'v1.29.1+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
       {
         id: 'v1.25.0+rke2r1', value: 'v1.25.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
       },
@@ -332,4 +345,200 @@ describe('component: rke2', () => {
       expect(agent.element).toBeDefined();
     });
   });
+
+  it.each([
+    ['v1.25.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'azure', true],
+    ['v1.31.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'harvester', true],
+    ['v1.29.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'harvester', false],
+    ['v1.31.0+k3s1', [{ value: 'aws' }], 'azure', false],
+  ])('should set isAzureProviderUnsupported', (k8s, providerOptions, cloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  _CREATE,
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': cloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: {
+        ...defaultComputed,
+        cloudProviderOptions: () => providerOptions
+      },
+      mocks: {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect((wrapper.vm as any).isAzureProviderUnsupported).toBe(value);
+  });
+
+  it.each([
+    ['edit', 'v1.31.0+k3s1', 'azure', false],
+    ['edit', 'v1.26.0+k3s1', 'azure', false],
+    ['edit', 'v1.28.0+k3s1', 'harvester', false],
+    ['edit', 'v1.28.0+k3s1', 'azure', true],
+    ['create', 'v1.28.0+k3s1', 'azure', false],
+    ['view', 'v1.28.0+k3s1', 'azure', false],
+  ])('should set canAzureMigrateOnEdit', (mode, k8s, liveCloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode,
+        liveValue: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect((wrapper.vm as any).canAzureMigrateOnEdit).toBe(value);
+  });
+
+  it.each([
+    ['', 'v1.32.0+rke2r1', 'amazon', 'v1.32.0+rke2r1'],
+    ['', 'v1.29.0+rke2r1', 'amazon', 'v1.29.0+rke2r1'],
+    ['', 'v1.29.0+rke2r1', 'azure', 'v1.29.0+rke2r1'],
+    ['not', 'v1.31.0+rke2r1', 'azure', undefined],
+  ])('should %p include version %p if Cloud Provider is %p', async(_, k8s, liveCloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: {
+        appsOSWarning: () => false,
+        showForm:      () => false,
+      },
+      mocks: {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    wrapper.setData({
+      rke2Versions: [{
+        id:         k8s,
+        version:    k8s,
+        serverArgs: true
+      }]
+    });
+
+    expect((wrapper.vm as any).versionOptions[0]?.value).toBe(value);
+  });
+
+  it.each([
+    ['enable', 'v1.28.0+rke2r1', false],
+    ['disable', 'v1.32.0+rke2r1', true],
+  ])('should %p Azure provider option if version is %p', async(_, k8s, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': 'azure' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        agentArgs: {
+          'cloud-provider-name': {
+            options: [
+              'azure',
+              'amazon'
+            ]
+          }
+        }
+      }),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const azureOption = (wrapper.vm as any).cloudProviderOptions.find((o: any) => o.value === 'azure');
+
+    expect(azureOption.disabled).toBe(value);
+  });
+
+  it.each([
+    ['enable', 'azure', 'v1.28.0+rke2r1', false], // azure provider / current
+    ['enable', 'external', 'v1.28.0+rke2r1', false], // external provider
+    ['enable', 'azure', 'v1.26.0+rke2r1', false], // version mismatch
+    ['disable', 'amazon', 'v1.26.0+rke2r1', true],
+    ['enable', '', 'v1.28.0+rke2r1', true], // default provider
+  ])('should %p provider option %p in edit mode if live provider is Azure and 1.27 <= k8s < 1.30', async(_, cloudProvider, k8s, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'edit',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': 'azure' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        canAzureMigrateOnEdit: true,
+        agentArgs:             {
+          'cloud-provider-name': {
+            options: [
+              'azure',
+              'amazon',
+              'external'
+            ]
+          }
+        }
+      }),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const azureOption = (wrapper.vm as any).cloudProviderOptions.find((o: any) => o.value === cloudProvider);
+
+    expect(azureOption.disabled).toBe(value);
+  });
 });

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

@@ -330,6 +330,14 @@ export default {
           });
         });
 
+        if (isElementalActive) {
+          // !this.subType means we are on the /create screen - we only want to show for rke2
+          // if a subType is selected, always add the ELEMENTAL_CLUSTER_PROVIDER type to cover edit scenarios
+          if ((!this.subType && !this.isRke1) || this.subType) {
+            addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
+          }
+        }
+
         if (this.isRke1 ) {
           machineTypes.forEach((type) => {
             const id = type.spec.displayName || type.id;
@@ -346,10 +354,6 @@ export default {
           });
 
           addType(this.$plugin, 'custom', 'custom2', false);
-
-          if (isElementalActive) {
-            addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
-          }
         }
 
         // Add from extensions