dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

package/edit/persistentvolume/index.vue

@@ -277,7 +277,10 @@ export default {
         />
       </div>
     </div>
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="plugin-configuration"
         :label="t('persistentVolume.pluginConfiguration.label')"
@@ -295,7 +298,7 @@ export default {
         :label="t('persistentVolume.customize.label')"
         :weight="0"
       >
-        <div class="row mb-20">
+        <div class="row">
           <div class="col span-6">
             <h3>{{ t('persistentVolume.customize.accessModes.label') }}</h3>
             <div>
@@ -320,6 +323,8 @@ export default {
               />
             </div>
           </div>
+        </div>
+        <div class="row">
           <div class="col span-6">
             <ArrayList
               v-model:value="value.spec.mountOptions"

package/edit/persistentvolumeclaim.vue

@@ -257,6 +257,8 @@ export default {
               @update:value="updateDefaults"
             />
           </div>
+        </div>
+        <div class="row">
           <div class="col span-6">
             <div class="row">
               <div

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

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 /* eslint-disable jest/no-hooks */
 import { mount, Wrapper } from '@vue/test-utils';
-import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
+import DirectoryConfig, { DATA_DIR_RADIO_OPTIONS, DEFAULT_SUBDIRS, DEFAULT_COMMON_BASE_PATH } from '@shell/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 
@@ -54,7 +54,7 @@ describe('component: DirectoryConfig', () => {
     expect(k8sDistroInput.exists()).toBe(false);
   });
 
-  it('updating common base directory should set the correct values on each data dir variable', async() => {
+  it('setting the radio option to "common" should set the correct values on each data dir variable', async() => {
     const newMountOptions = clone(mountOptions);
 
     wrapper = mount(
@@ -68,17 +68,12 @@ describe('component: DirectoryConfig', () => {
       }
     );
 
-    const inputPath = 'some-data-dir';
-    const commonInput = wrapper.find('[data-testid="rke2-directory-config-common-data-dir"]');
+    // update radio to the "common" option
+    await wrapper.vm.handleRadioInput(DATA_DIR_RADIO_OPTIONS.COMMON);
 
-    // update base dir value
-    expect(commonInput.exists()).toBe(true);
-    commonInput.setValue(inputPath);
-    await nextTick();
-
-    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.AGENT }`);
-    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
-    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
   });
 
   it('updating each individual data dir should set the correct values on each data dir variable', async() => {
@@ -179,4 +174,23 @@ describe('component: DirectoryConfig', () => {
     expect(wrapper.vm.value.provisioning).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
     expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ inputPath }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
   });
+
+  it('updating the k8s version for the "common" config should only update the sub dir for the k8sDistro value', async() => {
+    wrapper = mount(
+      DirectoryConfig,
+      mountOptions
+    );
+
+    // update radio to the "common" option
+    await wrapper.vm.handleRadioInput(DATA_DIR_RADIO_OPTIONS.COMMON);
+
+    expect(wrapper.vm.value.systemAgent).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.AGENT }`);
+    expect(wrapper.vm.value.provisioning).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.PROVISIONING }`);
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_K3S }`);
+
+    // let's update the k8s version
+    await wrapper.setProps({ k8sVersion: 'v1.32.4+rke2r1' });
+
+    expect(wrapper.vm.value.k8sDistro).toStrictEqual(`${ DEFAULT_COMMON_BASE_PATH }/${ DEFAULT_SUBDIRS.K8S_DISTRO_RKE2 }`);
+  });
 });

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

@@ -3,6 +3,7 @@ import { SECRET } from '@shell/config/types';
 import { _CREATE } from '@shell/config/query-params';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 import { get } from '@shell/utils/object';
+import { rke2TestTable } from './utils/rke2-test-data';
 
 /**
  * DISCLAIMER ***************************************************************************************
@@ -239,11 +240,12 @@ describe('component: rke2', () => {
 
     // we need to mock the "save" method from the create-edit-view-mixin
     // otherwise we get console errors
-    jest.spyOn(wrapper.vm, 'save').mockImplementation();
+    // jest.spyOn(wrapper.vm, 'save').mockImplementation();
 
     await wrapper.vm._doSaveOverride(jest.fn());
+    const chartKey = wrapper.vm.chartVersionKey(HARVESTER_CLOUD_PROVIDER);
 
-    const cloudConfigPath = get(wrapper.vm.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`);
+    const cloudConfigPath = get(wrapper.vm.userChartValues, `${ chartKey }.cloudConfigPath`);
 
     expect(cloudConfigPath).toStrictEqual('my-k8s-distro-path/etc/config-files/cloud-provider-config');
   });
@@ -543,4 +545,69 @@ describe('component: rke2', () => {
 
     expect(azureOption.disabled).toBe(value);
   });
+
+  it.each(rke2TestTable)('should preserve valid user-supplied chart values', (chartValues, expected) => {
+    const wrapper = mount(rke2, {
+      props: {
+        mode:  _CREATE,
+        value: {
+          spec: {
+            ...defaultSpec,
+            chartValues,
+            kubernetesVersion: 'v1.32.3+rke2r1',
+            rkeConfig:         {
+              machineGlobalConfig: {
+                cni:                   'calico',
+                'disable-kube-proxy':  false,
+                'etcd-expose-metrics': false
+              },
+            }
+          },
+          agentConfig: { 'cloud-provider-name': 'any' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        credentialId:    'I am authenticated',
+        userChartValues: chartValues,
+        rke2Versions:    [
+          {
+            id:                      'v1.32.3+rke2r1',
+            type:                    'release',
+            links:                   { self: 'https://127.0.0.1:8005/v1-rke2-release/releases/v1.32.3+rke2r1' },
+            version:                 'v1.32.3+rke2r1',
+            minChannelServerVersion: 'v2.11.0-alpha1',
+            maxChannelServerVersion: 'v2.11.99',
+            serverArgs:              {},
+            agentArgs:               {},
+            featureVersions:         { 'encryption-key-rotation': '2.0.0' },
+            charts:                  {
+              'rke2-ingress-nginx': {
+                repo:    'rancher-rke2-charts',
+                version: '4.12.100'
+              },
+              'rke2-metrics-server': {
+                repo:    'rancher-rke2-charts',
+                version: '3.12.200'
+              },
+            }
+          }
+        ]
+      }),
+
+      global: {
+        mocks: {
+          ...defaultMocks,
+          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
+          $plugin: { getDynamic: jest.fn(() => undefined ) },
+        },
+
+        stubs: defaultStubs,
+      },
+    });
+
+    wrapper.vm.applyChartValues(wrapper.vm.value.spec.rkeConfig);
+
+    expect(wrapper.vm.value.spec.rkeConfig.chartValues).toStrictEqual(expected);
+  });
 });

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

@@ -0,0 +1,58 @@
+export const rke2TestTable = [
+  [
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+  ],
+  [
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      },
+      'rke2-ingress-nginx-invalid': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+    {
+      'rke2-calico':        {},
+      'rke2-ingress-nginx': {
+        controller: {
+          extraArgs: {
+            'enable-ssl-passthrough':      true,
+            'watch-ingress-without-class': true
+          }
+        }
+      }
+    },
+  ],
+];

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

@@ -5,17 +5,16 @@ import { Banner } from '@components/Banner';
 import CruResource from '@shell/components/CruResource';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import EmberPage from '@shell/components/EmberPage';
-import { ToggleSwitch } from '@components/Form/ToggleSwitch';
 import {
   CHART, FROM_CLUSTER, SUB_TYPE, RKE_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW
 } from '@shell/config/query-params';
 import { mapGetters } from 'vuex';
 import { sortBy } from '@shell/utils/sort';
-import { PROVISIONER, _RKE1, _RKE2 } from '@shell/store/prefs';
+import { PROVISIONER, _RKE2 } from '@shell/store/prefs';
 import { filterAndArrangeCharts } from '@shell/store/catalog';
 import { CATALOG, CAPI as CAPI_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { CAPI, MANAGEMENT, DEFAULT_WORKSPACE } from '@shell/config/types';
-import { mapFeature, RKE2 as RKE2_FEATURE, RKE1_UI } from '@shell/store/features';
+import { mapFeature, RKE2 as RKE2_FEATURE } from '@shell/store/features';
 import { allHash } from '@shell/utils/promise';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
@@ -25,7 +24,6 @@ import { DRIVER_TO_IMPORT } from '@shell/models/management.cattle.io.kontainerdr
 const SORT_GROUPS = {
   template:  1,
   kontainer: 2,
-  rke1:      3,
   rke2:      3,
   register:  4,
   custom:    5,
@@ -49,7 +47,6 @@ export default {
     Loading,
     Rke2Config,
     SelectIconGrid,
-    ToggleSwitch,
     Banner
   },
 
@@ -105,6 +102,7 @@ export default {
       hash.kontainerDrivers = this.$store.dispatch('management/findAll', { type: MANAGEMENT.KONTAINER_DRIVER });
     }
 
+    // Not sure if needed for legacy hosted cluster?
     if ( this.value.id && !this.value.isRke2 ) {
       // These are needed to resolve references in the mgmt cluster -> node pool -> node template to figure out what provider the cluster is using
       // so that the edit iframe for ember pages can go to the right place.
@@ -217,7 +215,6 @@ export default {
         this.$store.dispatch('prefs/set', { key: PROVISIONER, value });
       }
     },
-    _RKE1: () => _RKE1,
     _RKE2: () => _RKE2,
 
     emberLink() {
@@ -282,8 +279,7 @@ export default {
       return '';
     },
 
-    rke2Enabled:   mapFeature(RKE2_FEATURE),
-    rke1UiEnabled: mapFeature(RKE1_UI),
+    rke2Enabled: mapFeature(RKE2_FEATURE),
 
     // todo nb is this info stored anywhere else..?
     selectedSubType() {
@@ -292,16 +288,6 @@ export default {
 
     provisioner: {
       get() {
-        // This can incorrectly return rke1 instead
-        // of rke2 for cluster owners.
-        if ( !this.rke2Enabled ) {
-          return _RKE1;
-        }
-
-        if ( !this.rke1UiEnabled ) {
-          return _RKE2;
-        }
-
         return this.preferredProvisioner;
       },
 
@@ -311,11 +297,11 @@ export default {
     },
 
     isRke1() {
-      return this.provisioner === _RKE1;
+      return this.value.isRke1;
     },
 
     isRke2() {
-      return this.value.isRke2 || !this.isRke1;
+      return this.value.isRke2;
     },
 
     templateOptions() {
@@ -357,23 +343,13 @@ export default {
           });
         });
 
+        // If Elemental is installed, then add the elemental cluster provider
         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);
-          }
+          addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
         }
 
-        if (this.isRke1 ) {
-          machineTypes.forEach((type) => {
-            const id = type.spec.displayName || type.id;
-
-            addType(this.$plugin, id, _RKE1, false, `/g/clusters/add/launch/${ id }`, this.iconClasses[id], type);
-          });
-
-          addType(this.$plugin, 'custom', 'custom1', false, '/g/clusters/add/launch/custom');
-        } else {
+        // Only add the RKE2 options if RKE2 is enabled
+        if (this.rke2Enabled) {
           machineTypes.forEach((type) => {
             const id = type.spec.displayName || type.id;
 
@@ -385,11 +361,6 @@ export default {
       }
       // Add from extensions
       this.extensions.forEach((ext) => {
-        // if the rke toggle is set to rke1, don't add extensions that specify rke2 group
-        // default group is rke2
-        if (!this.isRke2 && (ext.group === _RKE2 || !ext.group)) {
-          return;
-        }
         // Do not show the extension provisioner on the import cluster page unless its explicitly set to do so
         if (isImport && !ext.showImport) {
           return;
@@ -504,7 +475,7 @@ export default {
     },
 
     firstNodeDriverItem() {
-      return this.groupedSubTypes.findIndex((obj) => [_RKE1, _RKE2].includes(obj.name));
+      return this.groupedSubTypes.findIndex((obj) => [_RKE2].includes(obj.name));
     },
 
     firstCustomClusterItem() {
@@ -522,18 +493,6 @@ export default {
   },
 
   methods: {
-    showRkeToggle(i) {
-      if (this.isImport || !this.rke2Enabled) {
-        return false;
-      }
-
-      if (this.firstNodeDriverItem >= 0) {
-        return i === this.firstNodeDriverItem;
-      }
-
-      return i === this.firstCustomClusterItem;
-    },
-
     loadStylesheet(url, id) {
       if ( !id ) {
         console.error('loadStylesheet called without an id'); // eslint-disable-line no-console
@@ -620,6 +579,14 @@ export default {
 
 <template>
   <Loading v-if="$fetchState.pending" />
+  <div
+    v-else-if="isRke1"
+  >
+    <Banner
+      color="warning"
+      label-key="cluster.banner.rke1DeprecationMessage"
+    />
+  </div>
   <div
     v-else-if="emberLink"
     class="embed"
@@ -653,27 +620,8 @@ export default {
         style="width: 100%;"
       >
         <h4>
-          <div
-            v-if="showRkeToggle(i) && rke1UiEnabled"
-            class="grouped-type"
-          >
-            <ToggleSwitch
-              v-model:value="provisioner"
-              data-testid="cluster-manager-create-rke-switch"
-              class="rke-switch"
-              :off-value="_RKE1"
-              :off-label="t('cluster.toggle.v1')"
-              :on-value="_RKE2"
-              :on-label="t('cluster.toggle.v2')"
-            />
-          </div>
           {{ obj.label }}
         </h4>
-        <Banner
-          v-if="provisioner === _RKE1 && i === 1"
-          color="warning"
-          label-key="cluster.banner.rke1DeprecationShortMessage"
-        />
         <SelectIconGrid
           :rows="obj.types"
           key-field="id"
@@ -689,7 +637,7 @@ export default {
     <template v-if="subType">
       <!-- allow extensions to provide their own cluster provisioning form -->
       <component
-        :is="selectedSubType.component"
+        :is="selectedSubType?.component"
         v-if="selectedSubType && selectedSubType.component"
         v-model:value="localValue"
         :initial-value="initialValue"
@@ -706,7 +654,7 @@ export default {
         :live-value="liveValue"
         :mode="mode"
         :provider="subType"
-        :provider-config="selectedSubType.providerConfig"
+        :provider-config="selectedSubType?.providerConfig"
         @update:value="$emit('input', $event)"
       />
     </template>