@rancher/shell 0.3.8 → 0.3.10

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

@@ -77,7 +77,7 @@ export default {
     <h3>
       {{ t('registryMirror.header') }}
       <i
-        v-tooltip="t('registryMirror.toolTip')"
+        v-clean-tooltip="t('registryMirror.toolTip')"
         class="icon icon-info"
       />
     </h3>
@@ -116,7 +116,7 @@ export default {
             <h3>
               {{ t('registryMirrorRewrite.header') }}
               <i
-                v-tooltip="t('registryMirrorRewrite.toolTip')"
+                v-clean-tooltip="t('registryMirrorRewrite.toolTip')"
                 class="icon icon-info"
               />
             </h3>

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

@@ -1,8 +1,80 @@
 import { mount } from '@vue/test-utils';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 
+/**
+ * DISCLAIMER ***************************************************************************************
+ * Declarations should not be done outside the tests!!
+ * This component is overwhelming for test and requires too much initialization.
+ * In this way the tests are more readable and we can avoid annoying repetitions.
+ ****************************************************************************************************
+ */
+const defaultStubs = {
+  CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
+  Banner:                   true,
+  LabeledSelect:            true,
+  ACE:                      true,
+  AgentEnv:                 true,
+  ArrayList:                true,
+  ArrayListGrouped:         true,
+  BadgeState:               true,
+  Checkbox:                 true,
+  ClusterMembershipEditor:  true,
+  DrainOptions:             true,
+  LabeledInput:             true,
+  Labels:                   true,
+  Loading:                  true,
+  MachinePool:              true,
+  MatchExpressions:         true,
+  NameNsDescription:        true,
+  Questions:                true,
+  RadioGroup:               true,
+  RegistryConfigs:          true,
+  RegistryMirrors:          true,
+  S3Config:                 true,
+  SelectCredential:         true,
+  SelectOrCreateAuthSecret: true,
+  Tab:                      true,
+  Tabbed:                   true,
+  UnitInput:                true,
+  YamlEditor:               true,
+};
+
+const defaultComputed = {
+  showForm() {
+    return true;
+  },
+  showk8s21LegacyWarning() {
+    return false;
+  },
+};
+
+const defaultGetters = {
+  currentStore:           () => 'current_store',
+  'management/schemaFor': jest.fn(),
+  'current_store/all':    jest.fn(),
+  'i18n/t':               jest.fn(),
+  'i18n/withFallback':    jest.fn(),
+};
+
+const defaultMocks = {
+  $fetchState: { pending: false },
+  $route:      {
+    name:  'anything',
+    query: { AS: 'yaml' },
+  },
+};
+
+const defaultSpec = {
+  rkeConfig:   { etcd: { disableSnapshots: false } },
+  chartValues: {},
+};
+
 describe('component: rke2', () => {
-  // Disable existing log to avoid pollution
+  /**
+   * DISCLAIMER ***************************************************************************************
+   * Logs are prevented to avoid polluting the test output.
+   ****************************************************************************************************
+  */
   // eslint-disable-next-line jest/no-hooks
   beforeEach(() => {
     jest.spyOn(console, 'log').mockImplementation(() => {});
@@ -23,76 +95,25 @@ describe('component: rke2', () => {
         mode:  'create',
         value: {
           spec: {
-            rkeConfig:                                            { etcd: { disableSnapshots: false } },
-            chartValues:                                          {},
+            ...defaultSpec,
             defaultPodSecurityAdmissionConfigurationTemplateName: label,
             kubernetesVersion:                                    k8s
           }
         },
         provider: 'whatever',
-        resource: {}
       },
-      computed: {
-        showForm() {
-          return true;
-        },
-        hasMachinePools() {
-          return false;
-        },
-        showk8s21LegacyWarning() {
-          return false;
-        },
-      },
-      mocks: {
-        $fetchState: { pending: false },
-        $route:      {
-          name:  'anything',
-          query: { AS: 'yaml' },
-        },
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
         $store: {
-          getters: {
-            currentStore:           () => 'current_store',
-            'management/schemaFor': jest.fn(),
-            'current_store/all':    jest.fn(),
-            'i18n/t':               jest.fn(),
-            'i18n/withFallback':    jest.fn(),
-          },
+          getters:  defaultGetters,
           dispatch: {
             'management/find':    jest.fn(),
             'management/findAll': () => ([option]),
           }
         },
       },
-      stubs: {
-        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
-        Banner:                   true,
-        LabeledSelect:            true,
-        ACE:                      true,
-        AgentEnv:                 true,
-        ArrayList:                true,
-        ArrayListGrouped:         true,
-        BadgeState:               true,
-        Checkbox:                 true,
-        ClusterMembershipEditor:  true,
-        DrainOptions:             true,
-        LabeledInput:             true,
-        Labels:                   true,
-        Loading:                  true,
-        MachinePool:              true,
-        MatchExpressions:         true,
-        NameNsDescription:        true,
-        Questions:                true,
-        RadioGroup:               true,
-        RegistryConfigs:          true,
-        RegistryMirrors:          true,
-        S3Config:                 true,
-        SelectCredential:         true,
-        SelectOrCreateAuthSecret: true,
-        Tab:                      true,
-        Tabbed:                   true,
-        UnitInput:                true,
-        YamlEditor:               true,
-      }
+      stubs: defaultStubs
     });
 
     const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
@@ -115,76 +136,25 @@ describe('component: rke2', () => {
         mode:  'create',
         value: {
           spec: {
-            rkeConfig:                                            { etcd: { disableSnapshots: false } },
-            chartValues:                                          {},
+            ...defaultSpec,
             defaultPodSecurityAdmissionConfigurationTemplateName: label,
             kubernetesVersion:                                    k8s
           }
         },
         provider: 'whatever',
-        resource: {}
-      },
-      computed: {
-        showForm() {
-          return true;
-        },
-        hasMachinePools() {
-          return false;
-        },
-        showk8s21LegacyWarning() {
-          return false;
-        },
       },
-      mocks: {
-        $fetchState: { pending: false },
-        $route:      {
-          name:  'anything',
-          query: { AS: 'yaml' },
-        },
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
         $store: {
-          getters: {
-            currentStore:           () => 'current_store',
-            'management/schemaFor': jest.fn(),
-            'current_store/all':    jest.fn(),
-            'i18n/t':               jest.fn(),
-            'i18n/withFallback':    jest.fn(),
-          },
+          getters:  defaultGetters,
           dispatch: {
             'management/find':    jest.fn(),
             'management/findAll': () => ([option]),
           }
         },
       },
-      stubs: {
-        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
-        Banner:                   true,
-        LabeledSelect:            true,
-        ACE:                      true,
-        AgentEnv:                 true,
-        ArrayList:                true,
-        ArrayListGrouped:         true,
-        BadgeState:               true,
-        Checkbox:                 true,
-        ClusterMembershipEditor:  true,
-        DrainOptions:             true,
-        LabeledInput:             true,
-        Labels:                   true,
-        Loading:                  true,
-        MachinePool:              true,
-        MatchExpressions:         true,
-        NameNsDescription:        true,
-        Questions:                true,
-        RadioGroup:               true,
-        RegistryConfigs:          true,
-        RegistryMirrors:          true,
-        S3Config:                 true,
-        SelectCredential:         true,
-        SelectOrCreateAuthSecret: true,
-        Tab:                      true,
-        Tabbed:                   true,
-        UnitInput:                true,
-        YamlEditor:               true,
-      }
+      stubs: defaultStubs
     });
 
     const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
@@ -206,25 +176,15 @@ describe('component: rke2', () => {
         value: {
           agentConfig: { profile: cis },
           spec:        {
-            rkeConfig:                                            { etcd: { disableSnapshots: false } },
-            chartValues:                                          {},
+            ...defaultSpec,
             defaultPodSecurityAdmissionConfigurationTemplateName: label,
             kubernetesVersion:                                    k8s
           }
         },
         provider: 'custom',
-        resource: {}
       },
       computed: {
-        showForm() {
-          return true;
-        },
-        hasMachinePools() {
-          return false;
-        },
-        showk8s21LegacyWarning() {
-          return false;
-        },
+        ...defaultComputed,
         agentArgs:      () => ({ profile: { options: [cis] } }),
         versionOptions: () => [
           {
@@ -236,55 +196,16 @@ describe('component: rke2', () => {
         ]
       },
       mocks: {
-        $fetchState: { pending: false },
-        $route:      {
-          name:  'anything',
-          query: { AS: 'yaml' },
-        },
+        ...defaultMocks,
         $store: {
-          getters: {
-            currentStore:           () => 'current_store',
-            'management/schemaFor': jest.fn(),
-            'current_store/all':    jest.fn(),
-            'i18n/t':               jest.fn(),
-            'i18n/withFallback':    jest.fn(),
-          },
+          getters:  defaultGetters,
           dispatch: {
             'management/find':    jest.fn(),
             'management/findAll': () => ([option]),
           }
         },
       },
-      stubs: {
-        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
-        Banner:                   true,
-        LabeledSelect:            true,
-        ACE:                      true,
-        AgentEnv:                 true,
-        ArrayList:                true,
-        ArrayListGrouped:         true,
-        BadgeState:               true,
-        Checkbox:                 true,
-        ClusterMembershipEditor:  true,
-        DrainOptions:             true,
-        LabeledInput:             true,
-        Labels:                   true,
-        Loading:                  true,
-        MachinePool:              true,
-        MatchExpressions:         true,
-        NameNsDescription:        true,
-        Questions:                true,
-        RadioGroup:               true,
-        RegistryConfigs:          true,
-        RegistryMirrors:          true,
-        S3Config:                 true,
-        SelectCredential:         true,
-        SelectOrCreateAuthSecret: true,
-        Tab:                      true,
-        Tabbed:                   true,
-        UnitInput:                true,
-        YamlEditor:               true,
-      }
+      stubs: defaultStubs
     });
 
     wrapper.setData({ cisOverride: override });
@@ -293,4 +214,57 @@ describe('component: rke2', () => {
 
     expect((select.vm as unknown as any).disabled).toBe(disabled);
   });
+
+  it.each([
+    ['custom', true],
+    ['anything else', false] // without proper data, machine pool is always not present
+  ])('should allow creation of RKE2 cluster with provider %p if pool machines are missing (%p)', (provider, result) => {
+    const k8s = 'v1.25.0+rke2r1';
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s,
+
+          }
+        },
+        provider,
+      },
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect(wrapper.vm.validationPassed()).toBe(result);
+  });
+
+  it('should allow creation of K3 clusters if pool machines are missing', () => {
+    const k8s = 'v1.25.0+k3s1';
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({ credentialId: 'I am authenticated' }),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect(wrapper.vm.validationPassed()).toBe(true);
+  });
 });

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

@@ -477,6 +477,7 @@ export default {
     :errors="errors"
     :subtypes="subTypes"
     :cancel-event="true"
+    :prevent-enter-submit="true"
     class="create-cluster"
     @finish="save"
     @cancel="cancel"

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

@@ -69,6 +69,7 @@ import S3Config from './S3Config';
 import SelectCredential from './SelectCredential';
 import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import { ELEMENTAL_SCHEMA_IDS, KIND, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
+import AgentConfiguration, { cleanAgentConfiguration } from './AgentConfiguration';
 
 const PUBLIC = 'public';
 const PRIVATE = 'private';
@@ -96,6 +97,8 @@ const NODE_TOTAL = {
     icon:  'icon-checkmark'
   }
 };
+const CLUSTER_AGENT_CUSTOMIZATION = 'clusterAgentDeploymentCustomization';
+const FLEET_AGENT_CUSTOMIZATION = 'fleetAgentDeploymentCustomization';
 
 export default {
   components: {
@@ -107,6 +110,7 @@ export default {
     BadgeState,
     Banner,
     Checkbox,
+    AgentConfiguration,
     ClusterMembershipEditor,
     CruResource,
     DrainOptions,
@@ -274,6 +278,18 @@ export default {
 
       this.userChartValues[key] = value;
     });
+
+    // Ensure we have empty models for the two agent configurations
+
+    // Cluster Agent Configuration
+    if ( !this.value.spec[CLUSTER_AGENT_CUSTOMIZATION]) {
+      set(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION, {});
+    }
+
+    // Fleet Agent Configuration
+    if ( !this.value.spec[FLEET_AGENT_CUSTOMIZATION] ) {
+      set(this.value.spec, FLEET_AGENT_CUSTOMIZATION, {});
+    }
   },
 
   data() {
@@ -702,7 +718,7 @@ export default {
     },
 
     unremovedMachinePools() {
-      return this.machinePools.filter(x => !x.remove);
+      return (this.machinePools || []).filter(x => !x.remove);
     },
 
     machineConfigSchema() {
@@ -1081,6 +1097,7 @@ export default {
   created() {
     this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools');
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
+    this.registerBeforeHook(this.agentConfigurationCleanup, 'cleanup-agent-config');
     this.registerAfterHook(this.cleanupMachinePools, 'cleanup-machine-pools');
     this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
   },
@@ -1089,6 +1106,12 @@ export default {
     nlToBr,
     set,
 
+    agentConfigurationCleanup() {
+      // Clean agent configuration objects, so we only send values when the user has configured something
+      cleanAgentConfiguration(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION);
+      cleanAgentConfiguration(this.value.spec, FLEET_AGENT_CUSTOMIZATION);
+    },
+
     /**
      * set instanceNameLimit to 15 to all pool machine if truncateHostnames checkbox is clicked
      */
@@ -1110,6 +1133,10 @@ export default {
       return isRequiredVersion;
     },
 
+    /**
+     * Get machine pools from the cluster configuration
+     * this.value.spec.rkeConfig.machinePools
+     */
     async initMachinePools(existing) {
       const out = [];
 
@@ -1467,7 +1494,20 @@ export default {
         delete this.value.spec.rkeConfig.machineGlobalConfig.profile;
       }
 
+      // store the current data for fleet and cluster agent so that we can re-apply it later if the save fails
+      // we also have a before hook (check created() hooks) where the cleanup of the data occurs
+      const clusterAgentDeploymentCustomization = JSON.parse(JSON.stringify(this.value.spec[CLUSTER_AGENT_CUSTOMIZATION]));
+      const fleetAgentDeploymentCustomization = JSON.parse(JSON.stringify(this.value.spec[FLEET_AGENT_CUSTOMIZATION]));
+
       await this.save(btnCb);
+
+      // comes from createEditView mixin
+      // if there are any errors saving, restore the agent config data
+      if (this.errors?.length) {
+        // Ensure the agent configuration is set back to the values before we changed (cleaned) it
+        set(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION, clusterAgentDeploymentCustomization);
+        set(this.value.spec, FLEET_AGENT_CUSTOMIZATION, fleetAgentDeploymentCustomization);
+      }
     },
     // create a secret to reference the harvester cluster kubeconfig in rkeConfig
     async createKubeconfigSecret(kubeconfig = '') {
@@ -1993,6 +2033,11 @@ export default {
 
           this.previousKubernetesVersion = value;
         }
+
+        // If Harvester driver, reset cloud provider if not compatible
+        if (this.isHarvesterDriver && this.mode === _CREATE && this.isHarvesterIncompatible) {
+          this.setHarvesterDefaultCloudProvider();
+        }
       }
     },
 
@@ -2084,21 +2129,21 @@ export default {
             class="pull-right"
           >
             <BadgeState
-              v-tooltip="nodeTotals.tooltip.etcd"
+              v-clean-tooltip="nodeTotals.tooltip.etcd"
               :color="nodeTotals.color.etcd"
               :icon="nodeTotals.icon.etcd"
               :label="nodeTotals.label.etcd"
               class="mr-10"
             />
             <BadgeState
-              v-tooltip="nodeTotals.tooltip.controlPlane"
+              v-clean-tooltip="nodeTotals.tooltip.controlPlane"
               :color="nodeTotals.color.controlPlane"
               :icon="nodeTotals.icon.controlPlane"
               :label="nodeTotals.label.controlPlane"
               class="mr-10"
             />
             <BadgeState
-              v-tooltip="nodeTotals.tooltip.worker"
+              v-clean-tooltip="nodeTotals.tooltip.worker"
               :color="nodeTotals.color.worker"
               :icon="nodeTotals.icon.worker"
               :label="nodeTotals.label.worker"
@@ -2515,7 +2560,7 @@ export default {
           <h3>
             {{ t('cluster.rke2.address.header') }}
             <i
-              v-tooltip="t('cluster.rke2.address.tooltip')"
+              v-clean-tooltip="t('cluster.rke2.address.tooltip')"
               class="icon icon-info"
             />
           </h3>
@@ -2807,7 +2852,7 @@ export default {
             <h3>
               {{ t('cluster.addOns.additionalManifest.title') }}
               <i
-                v-tooltip="t('cluster.addOns.additionalManifest.tooltip')"
+                v-clean-tooltip="t('cluster.addOns.additionalManifest.tooltip')"
                 class="icon icon-info"
               />
             </h3>
@@ -2821,6 +2866,30 @@ export default {
           </div>
         </Tab>
 
+        <!-- Cluster Agent Configuration -->
+        <Tab
+          name="clusteragentconfig"
+          label-key="cluster.agentConfig.tabs.cluster"
+        >
+          <AgentConfiguration
+            v-model="value.spec.clusterAgentDeploymentCustomization"
+            type="cluster"
+            :mode="mode"
+          />
+        </Tab>
+
+        <!-- Fleet Agent Configuration -->
+        <Tab
+          name="fleetagentconfig"
+          label-key="cluster.agentConfig.tabs.fleet"
+        >
+          <AgentConfiguration
+            v-model="value.spec.fleetAgentDeploymentCustomization"
+            type="fleet"
+            :mode="mode"
+          />
+        </Tab>
+
         <!-- Advanced -->
         <Tab
           v-if="haveArgInfo || agentArgs['protect-kernel-defaults']"

package/edit/resources.cattle.io.restore.vue

@@ -274,7 +274,7 @@ export default {
               >
                 <template #label>
                   <span
-                    v-tooltip="t('backupRestoreOperator.prune.tip')"
+                    v-clean-tooltip="t('backupRestoreOperator.prune.tip')"
                     class="text-label"
                   >
                     {{ t('backupRestoreOperator.prune.label') }} <i class="icon icon-info" />
@@ -290,7 +290,7 @@ export default {
               >
                 <template #label>
                   <label
-                    v-tooltip="t('backupRestoreOperator.deleteTimeout.tip')"
+                    v-clean-tooltip="t('backupRestoreOperator.deleteTimeout.tip')"
                     class="has-tooltip"
                   >
                     {{ t('backupRestoreOperator.deleteTimeout.label') }} <i class="icon icon-info" />

package/edit/service.vue

@@ -20,12 +20,13 @@ import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
 import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOnConfig';
 import { clone } from '@shell/utils/object';
-import { POD, CAPI } from '@shell/config/types';
+import { POD, CAPI, HCI } from '@shell/config/types';
 import { matching } from '@shell/utils/selector';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
 import { Port } from '@shell/utils/validators/formRules';
+import { HCI as HCI_LABELS_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 const SESSION_AFFINITY_ACTION_VALUES = {
   NONE:     'None',
@@ -268,8 +269,9 @@ export default {
         const inStore = this.$store.getters['currentStore'](POD);
 
         const hash = {
-          provClusters: this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:         this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
         const res = await allHash(hash);
@@ -313,6 +315,23 @@ export default {
       if (ports && ports.length > 0) {
         this.value.spec.ports = this.targetPortsStrOrInt(this.value.spec.ports);
       }
+
+      if (this.showHarvesterAddOnConfig) {
+        const clusters = this.$store.getters['management/all'](CAPI.RANCHER_CLUSTER);
+        const configs = this.$store.getters['management/all'](HCI.HARVESTER_CONFIG);
+        const cluster = clusters.find(c => c.status.clusterName === this.currentCluster.id);
+
+        const machinePools = cluster?.spec?.rkeConfig?.machinePools || [];
+        const machineConfigName = machinePools[0]?.machineConfigRef?.name;
+        const config = configs.find(c => c.id === `fleet-default/${ machineConfigName }`);
+
+        if (config) {
+          const { vmNamespace, networkName } = config;
+
+          this.value.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NAMESPACE] = vmNamespace;
+          this.value.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NETWORK] = networkName;
+        }
+      }
     },
   },
 };

package/edit/storage.k8s.io.storageclass/index.vue

@@ -125,7 +125,7 @@ export default {
         if (driver.metadata.name === LONGHORN_DRIVER || provisionerOptionsDrivers.includes(driver.metadata.name)) {
           return;
         }
-        const fallback = `${ driver.metadata.name }  ${ this.t('persistentVolume.csi.drivers.suffix') }`;
+        const fallback = `${ driver.metadata.name }  ${ this.t('persistentVolume.csi.suffix') }`;
 
         dropdownOptions.push({
           value: driver.metadata.name,