@rancher/shell 0.3.15 → 0.3.17

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

@@ -9,35 +9,6 @@ import { cleanUp } from '@shell/utils/object';
 import { fetchSetting } from '@shell/utils/settings';
 import { RadioGroup } from '@components/Form/Radio';
 
-export function cleanAgentConfiguration(model, key) {
-  if (!model || !model[key]) {
-    return;
-  }
-
-  const v = model[key];
-
-  if (Array.isArray(v) && v.length === 0) {
-    delete model[key];
-  } else if (v && typeof v === 'object') {
-    Object.keys(v).forEach((k) => {
-      // delete these auxiliary props used in podAffinity and nodeAffinity that shouldn't be sent to the server
-      if (k === '_namespaceOption' || k === '_namespaces' || k === '_anti' || k === '_id') {
-        delete v[k];
-      }
-
-      // prevent cleanup of "namespaceSelector" when an empty object because it represents all namespaces in pod/node affinity
-      // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#podaffinityterm-v1-core
-      if (k !== 'namespaceSelector') {
-        cleanAgentConfiguration(v, k);
-      }
-    });
-
-    if (Object.keys(v).length === 0) {
-      delete model[key];
-    }
-  }
-}
-
 // Affinity radio button choices
 const DEFAULT = 'default';
 const CUSTOM = 'custom';
@@ -215,7 +186,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="value && Object.keys(value).length">
+  <div>
     <Banner
       :closable="false"
       color="info"

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

@@ -1,4 +1,4 @@
-import { mount } from '@vue/test-utils';
+import { mount, shallowMount } from '@vue/test-utils';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 
 /**
@@ -14,6 +14,7 @@ const defaultStubs = {
   LabeledSelect:            true,
   ACE:                      true,
   AgentEnv:                 true,
+  AgentConfiguration:       true,
   ArrayList:                true,
   ArrayListGrouped:         true,
   BadgeState:               true,
@@ -267,4 +268,81 @@ describe('component: rke2', () => {
 
     expect((wrapper.vm as any).validationPassed).toBe(true);
   });
+
+  // TODO: Complete test after implementing fetch https://github.com/rancher/dashboard/issues/9322
+  // eslint-disable-next-line jest/no-disabled-tests
+  describe.skip('should initialize agent configuration values', () => {
+    it('adding default values if none', async() => {
+      const wrapper = shallowMount(rke2, {
+        propsData: {
+          mode:     'create',
+          value:    { spec: { ...defaultSpec } },
+          provider: 'custom'
+        },
+        computed: defaultComputed,
+        mocks:    {
+          ...defaultMocks,
+          $store: {
+            getters:  defaultGetters,
+            dispatch: {
+              'management/request': jest.fn(),
+              'management/find':    jest.fn(),
+              'management/findAll': () => ([]),
+            }
+          },
+        },
+        stubs: defaultStubs
+      });
+      const defaultAgentConfig = {
+        clusterAgentDeploymentCustomization: {
+          overrideAffinity:             {},
+          appendTolerations:            [],
+          overrideResourceRequirements: {}
+        },
+        fleetAgentDeploymentCustomization: {
+          overrideAffinity:             {},
+          appendTolerations:            [],
+          overrideResourceRequirements: {}
+        }
+      };
+
+      // Setting RKE to avoid calls
+      wrapper.setData({ rke2Versions: [] });
+
+      // await rke2.fetch.call(wrapper.vm);
+
+      expect(wrapper.props().value.spec).toContain(defaultAgentConfig);
+    });
+
+    it('should display agent configuration tab', async() => {
+      const wrapper = shallowMount(rke2, {
+        propsData: {
+          mode:     'create',
+          value:    { spec: { ...defaultSpec } },
+          provider: 'custom'
+        },
+        computed: defaultComputed,
+        mocks:    {
+          ...defaultMocks,
+          $store: {
+            getters:  defaultGetters,
+            dispatch: {
+              'management/request': jest.fn(),
+              'management/find':    jest.fn(),
+              'management/findAll': () => ([]),
+            }
+          },
+        },
+        stubs: defaultStubs
+      });
+      const agent = wrapper.find('[data-testid="rke2-cluster-agent-config"]');
+
+      // Setting RKE to avoid calls
+      wrapper.setData({ rke2Versions: [] });
+
+      await rke2.fetch.call(wrapper.vm);
+
+      expect(agent.element).toBeDefined();
+    });
+  });
 });

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

@@ -138,6 +138,27 @@ export default {
         this.iconClasses[name] = `machine-driver ${ name }`;
       }
     });
+
+    // Custom Providers from extensions - initialize each with the store and the i18n service
+    // Wrap in try ... catch, to prevent errors in an extension breaking the page
+    try {
+      const extensionClasses = this.$plugin.listDynamic('provisioner').map((name) => this.$plugin.getDynamic('provisioner', name));
+
+      // We can't pass in this.$store as this leads to a circular-reference that causes Vue to freeze,
+      // so pass in specific services that the provisioner extension may need
+      this.extensions = extensionClasses.map((c) => new c({
+        dispatch: this.$store.dispatch,
+        getters:  this.$store.getters,
+        axios:    this.$store.$axios,
+        $plugin:  this.$store.app.$plugin,
+        t:        (...args) => this.t.apply(this, args),
+        isCreate: this.isCreate,
+        isEdit:   this.isEdit,
+        isView:   this.isView,
+      }));
+    } catch (e) {
+      console.error('Error loading provisioner(s) from extensions', e); // eslint-disable-line no-console
+    }
   },
 
   data() {
@@ -148,6 +169,7 @@ export default {
     return {
       nodeDrivers:      [],
       kontainerDrivers: [],
+      extensions:       [],
       subType,
       chart,
       isImport,
@@ -285,6 +307,11 @@ export default {
             addType(id, 'rke2', false);
           });
 
+          // Add from extensions
+          this.extensions.forEach((ext) => {
+            addExtensionType(ext, getters);
+          });
+
           addType('custom', 'custom2', false);
 
           if (isElementalActive) {
@@ -295,6 +322,31 @@ export default {
 
       return out;
 
+      function addExtensionType(ext, getters) {
+        let iconClass = ext.iconClass;
+        let icon = ext.icon;
+
+        if (icon) {
+          iconClass = undefined;
+        } else if (!iconClass) {
+          icon = require('~shell/assets/images/generic-driver.svg');
+        }
+
+        const subtype = {
+          id:          ext.id,
+          label:       ext.label || getters['i18n/t'](`cluster.provider.${ ext.id }`),
+          description: ext.description,
+          icon,
+          iconClass,
+          group:       ext.group || 'rke2',
+          disabled:    ext.disabled || false,
+          link:        ext.link,
+          tag:         ext.tag
+        };
+
+        out.push(subtype);
+      }
+
       function addType(id, group, disabled = false, link = null, iconClass = undefined) {
         const label = getters['i18n/withFallback'](`cluster.provider."${ id }"`, null, id);
         const description = getters['i18n/withFallback'](`cluster.providerDescription."${ id }"`, null, '');