@rancher/shell 0.3.24 → 0.3.26

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

@@ -2,6 +2,7 @@
 import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import UnitInput from '@shell/components/form/UnitInput.vue';
+import { mapGetters } from 'vuex';
 
 const DEFAULTS = {
   deleteEmptyDirData:              true, // Show; Kill pods using emptyDir volumes and lose the data
@@ -51,6 +52,8 @@ export default {
     this.update();
   },
 
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+
   methods: {
     update() {
       const out = {};
@@ -90,8 +93,8 @@ export default {
       <div class="mt-20">
         <Checkbox
           v-model="deleteEmptyDirData"
-          label="Delete pods using emptyDir volumes"
-          tooltip="emptyDir volumes are often used for ephemeral data, but the data will be permanently deleted.  Draining will fail if this is not set and there are pods using emptyDir."
+          label-key="cluster.rke2.drain.deleteEmptyDir.label"
+          tooltip-key="cluster.rke2.drain.deleteEmptyDir.tooltip"
           @input="update"
         />
       </div>
@@ -99,21 +102,23 @@ export default {
         <Checkbox
           v-model="force"
           label="Delete standalone pods"
+          label-key="cluster.rke2.drain.force.label"
           tooltip="Delete standalone pods which are not managed by a Workload controller (Deployment, Job, etc).  Draining will fail if this is not set and there are standalone pods."
+          tooltop-key="cluster.rke2.drain.force.tooltip"
           @input="update"
         />
       </div>
       <div>
         <Checkbox
           v-model="customGracePeriod"
-          label="Override pod termination grace periods"
+          label-key="cluster.rke2.drain.gracePeriod.checkboxLabel"
           @input="update"
         />
         <UnitInput
           v-if="customGracePeriod"
           v-model="gracePeriod"
-          label="Grace Period"
-          suffix="Seconds"
+          label-key="cluster.rke2.drain.gracePeriod.inputLabel"
+          :suffix="t('suffix.seconds', {count: timeout})"
           class="mb-10"
           @input="update"
         />
@@ -121,14 +126,14 @@ export default {
       <div>
         <Checkbox
           v-model="customTimeout"
-          label="Timeout after"
+          label-key="cluster.rke2.drain.timeout.checkboxLabel"
           @input="update"
         />
         <UnitInput
           v-if="customTimeout"
           v-model="timeout"
-          label="Drain Timeout"
-          suffix="Seconds"
+          label-key="cluster.rke2.drain.timeout.inputLabel"
+          :suffix="t('suffix.seconds', {count: timeout})"
           class="drain-timeout"
           @input="update"
         />

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

@@ -64,6 +64,11 @@ export default {
     busy: {
       type:    Boolean,
       default: false,
+    },
+
+    poolId: {
+      type:     String,
+      required: true,
     }
   },
 
@@ -108,7 +113,7 @@ export default {
     return {
       uuid: randomStr(),
 
-      unhealthyNodeTimeoutInteger: this.value.pool.unhealthyNodeTimeout ? parseDuration(this.value.pool.unhealthyNodeTimeout) : 0
+      unhealthyNodeTimeoutInteger: this.value.pool.unhealthyNodeTimeout ? parseDuration(this.value.pool.unhealthyNodeTimeout) : 0,
     };
   },
 
@@ -151,6 +156,9 @@ export default {
   },
 
   methods: {
+    emitError(e) {
+      this.$emit('error', e);
+    },
     async test() {
       if ( typeof this.$refs.configComponent?.test === 'function' ) {
         let errors = [];
@@ -260,9 +268,10 @@ export default {
       :provider="provider"
       :credential-id="credentialId"
       :pool-index="idx"
+      :pool-id="poolId"
       :machine-pools="machinePools"
       :busy="busy"
-      @error="e=>errors = e"
+      @error="emitError"
       @updateMachineCount="updateMachineCount"
       @expandAdvanced="expandAdvanced"
       @validationChanged="validationChanged"

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

@@ -0,0 +1,40 @@
+<script>
+
+import ClusterMembershipEditor from '@shell/components/form/Members/ClusterMembershipEditor';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { Banner } from '@components/Banner';
+export default {
+  components: { ClusterMembershipEditor, Banner },
+  mixins:     [CreateEditView],
+  props:      {
+    mode: {
+      type:     String,
+      required: true,
+    },
+
+    value: {
+      type:     Object,
+      required: true,
+    },
+    onMembershipUpdate: {
+      type:     Function,
+      required: true
+    }
+  }
+};
+</script>
+<template>
+  <div>
+    <Banner
+      v-if="isEdit"
+      color="info"
+    >
+      {{ t('cluster.memberRoles.removeMessage') }}
+    </Banner>
+    <ClusterMembershipEditor
+      :mode="mode"
+      :parent-id="value.mgmt ? value.mgmt.id : null"
+      @membership-update="onMembershipUpdate"
+    />
+  </div>
+</template>

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

@@ -0,0 +1,237 @@
+import { mount } from '@vue/test-utils';
+import Basics from '@shell/edit/provisioning.cattle.io.cluster/Basics';
+
+const defaultStubs = {
+  Banner:        true,
+  LabeledSelect: true,
+  YamlEditor:    true,
+  Checkbox:      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: {},
+};
+
+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:                     [],
+        needsPsp:                    false,
+        selectedVersion:             k8s,
+        versionOptions:              mockVersionOptions,
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        clusterIsAlreadyCreated:     false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             false,
+        isK3s:                       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).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:                     [],
+        needsPsp:                    false,
+        selectedVersion:             mockVersionOptions[0],
+        versionOptions:              mockVersionOptions,
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        clusterIsAlreadyCreated:     false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             false,
+        isK3s:                       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).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:            [],
+        needsPsp:           false,
+        cisOverride:        override,
+        selectedVersion:    mockVersionOptions[0],
+        versionOptions:     [{
+          value:     k8s,
+          agentArgs: { profile: { options: [cis] } },
+          charts:    {},
+          profile:   { options: [cis] }
+        }],
+        isHarvesterDriver:           false,
+        isHarvesterIncompatible:     false,
+        showDeprecatedPatchVersions: false,
+        clusterIsAlreadyCreated:     false,
+        isElementalCluster:          false,
+        hasPsaTemplates:             true,
+        isK3s:                       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);
+  });
+});

package/edit/provisioning.cattle.io.cluster/__tests__/CustomCommand.tests.ts

@@ -2,35 +2,83 @@ import { mount } from '@vue/test-utils';
 import CustomCommand from '@shell/edit/provisioning.cattle.io.cluster/CustomCommand.vue';
 
 describe('component: CustomCommand', () => {
-  it('should return linux commands with the right flags based on cluster information', () => {
-    const token = 'MY_TOKEN';
-    const ip = 'MY_IP';
-    const checkSum = 'MY_CHECKSUM';
-    const wrapper = mount(CustomCommand, {
-      propsData: {
-        cluster:      {},
-        clusterToken: {
-          insecureNodeCommand: ` curl --insecure -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`,
-          nodeCommand:         ` curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`
+  const token = 'MY_TOKEN';
+  const ip = 'MY_IP';
+  const checkSum = 'MY_CHECKSUM';
+  const wrapper = mount(CustomCommand, {
+    mocks: {
+      $store: {
+        getters: {
+          currentStore:           () => 'current_store',
+          'management/schemaFor': jest.fn(),
+          'current_store/all':    jest.fn(),
+          'i18n/t':               jest.fn(),
+          'i18n/withFallback':    jest.fn(),
         }
       },
-      // stubs: { CopyCode: { template: '<div></div> ' } },
-      data: () => ({
-        address:         '',
-        controlPlane:    true,
-        etcd:            true,
-        insecure:        false,
-        internalAddress: '',
-        labels:          {},
-        nodeName:        '',
-        taints:          [],
-        worker:          true,
-      }),
-    });
+    },
+    propsData: {
+      cluster:      {},
+      clusterToken: {
+        insecureNodeCommand: ` curl --insecure -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`,
+        nodeCommand:         ` curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`
+      }
+    },
+    data: () => ({
+      address:         '',
+      controlPlane:    true,
+      etcd:            true,
+      insecure:        false,
+      internalAddress: '',
+      labels:          {},
+      nodeName:        '',
+      taints:          [],
+      worker:          true,
+    }),
+  });
 
+  it('should return linux commands with the right flags based on cluster information', () => {
     const value = `curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum } --etcd --controlplane --worker`;
     const element = wrapper.find('#copiedLinux').element;
 
     expect(element.textContent).toContain(value);
   });
+
+  it('should not display warning message if all node roles are selected', async() => {
+    await wrapper.setData({
+      controlPlane: true,
+      etcd:         true,
+      worker:       true,
+    });
+
+    const element = wrapper.find('[data-testid="node-role-warning"]').element;
+
+    expect(element).toBeUndefined();
+  });
+
+  describe('should display warning message if at least one of the node roles is unselected', () => {
+    it.each([
+      [true, true, false],
+      [true, false, true],
+      [true, false, false],
+      [false, true, true],
+      [false, true, false],
+      [false, false, true],
+      [false, false, false],
+    ])('controlPlane: %p, etcd: %p, worker: %p', async(
+      controlPlane,
+      etcd,
+      worker
+    ) => {
+      await wrapper.setData({
+        controlPlane,
+        etcd,
+        worker
+      });
+
+      const element = wrapper.find('[data-testid="node-role-warning"]').element;
+
+      expect(element).toBeDefined();
+    });
+  });
 });

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

@@ -0,0 +1,52 @@
+import { mount } from '@vue/test-utils';
+import DrainOptions from '@shell/edit/provisioning.cattle.io.cluster/DrainOptions.vue';
+import { DefaultProps } from 'vue/types/options';
+import { ExtendedVue, Vue } from 'vue/types/vue';
+
+describe('drain options', () => {
+  it('should update an empty value with default drain options', () => {
+    const wrapper = mount(DrainOptions as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
+      propsData: { value: { }, mode: 'create' },
+      mocks:     { $store: { getters: { 'i18n/t': jest.fn() } } },
+
+    });
+
+    expect(wrapper.emitted('input')?.[0]?.[0]).toStrictEqual({
+      deleteEmptyDirData:              true,
+      disableEviction:                 false,
+      enabled:                         false,
+      force:                           false,
+      gracePeriod:                     -1,
+      ignoreDaemonSets:                true,
+      skipWaitForDeleteTimeoutSeconds: 0,
+      timeout:                         120,
+    });
+  });
+
+  it('should not overwrite existing drain option values', () => {
+    const upgradeStrategy = {
+      deleteEmptyDirData: false,
+      disableEviction:    false,
+      enabled:            false,
+      force:              true,
+      ignoreDaemonSets:   false,
+      timeout:            90,
+    };
+    const wrapper = mount(DrainOptions as unknown as ExtendedVue<Vue, {}, {}, {}, DefaultProps>, {
+      propsData: { value: upgradeStrategy, mode: 'create' },
+      mocks:     { $store: { getters: { 'i18n/t': jest.fn() } } },
+
+    });
+
+    expect(wrapper.emitted('input')?.[0]?.[0]).toStrictEqual({
+      deleteEmptyDirData:              false,
+      disableEviction:                 false,
+      enabled:                         false,
+      force:                           true,
+      gracePeriod:                     -1,
+      ignoreDaemonSets:                false,
+      skipWaitForDeleteTimeoutSeconds: 0,
+      timeout:                         90,
+    });
+  });
+});