@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.3

package/edit/networking.k8s.io.ingress/index.vue

@@ -87,21 +87,21 @@ export default {
           path: 'spec.rules.http.paths.path', rules: ['absolutePath'], translationKey: 'ingress.rules.path.label'
         },
         {
-          path: 'spec.rules.http.paths.backend.service.port.number', rules: ['required'], translationKey: 'ingress.rules.port.label'
+          path: 'spec.rules.http.paths.backend.service.port', rules: ['portRequired', 'portRange'], translationKey: 'ingress.rules.port.label'
         },
         {
           path: 'spec.rules.http.paths.backend.service.name', rules: ['required'], translationKey: 'ingress.rules.target.label'
         },
         { path: 'spec', rules: ['backEndOrRules'] },
         {
-          path: 'spec.defaultBackend.service.name', rules: ['required'], translationKey: 'ingress.defaultBackend.targetService.label'
+          path: 'spec.defaultBackend.service.name', rules: ['defaultBackendNameRequired'], translationKey: 'ingress.defaultBackend.targetService.label'
         },
         {
-          path: 'spec.defaultBackend.service.port.number', rules: ['required', 'requiredInt', 'portNumber'], translationKey: 'ingress.defaultBackend.port.label'
+          path: 'spec.defaultBackend.service.port', rules: ['defaultBackendPortRequired', 'portRange'], translationKey: 'ingress.defaultBackend.port.label'
         },
         { path: 'spec.tls.hosts', rules: ['required', 'wildcardHostname'] }
       ],
-      fvReportedValidationPaths: ['spec.rules.http.paths.backend.service.port.number', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.name']
+      fvReportedValidationPaths: ['spec.rules.http.paths.backend.service.port', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.name']
     };
   },
 
@@ -125,35 +125,89 @@ export default {
         }
       };
 
-      return { backEndOrRules };
+      const portLabel = this.t('ingress.rules.port.label');
+
+      // Built-in `required` won't work: it passes for empty objects like {} or { name: '' }.
+      const portRequired = (port) => {
+        if (typeof port === 'string' || typeof port === 'number') {
+          if (!port) {
+            return this.t('validation.required', { key: portLabel });
+          }
+        } else if (!port || (!port.number && !port.name)) {
+          return this.t('validation.required', { key: portLabel });
+        }
+      };
+
+      const portRange = (port) => {
+        let num;
+
+        if (typeof port === 'number') {
+          num = port;
+        } else if (typeof port === 'string') {
+          num = Number.parseInt(port);
+        } else if (port?.number) {
+          num = port.number;
+        }
+
+        if (num !== undefined && !Number.isNaN(num) && (num < 1 || num > 65535)) {
+          return this.t('validation.number.between', {
+            key: portLabel, min: '1', max: '65535'
+          });
+        }
+      };
+
+      const hasDefaultBackendService = () => {
+        const backend = get(this.value?.spec, this.value.defaultBackendPath);
+
+        return !!get(backend, this.value.serviceNamePath);
+      };
+
+      const nameLabel = this.t('ingress.defaultBackend.targetService.label');
+
+      // Only enforce required on the default backend when a service is selected.
+      // Selecting "None" means the user wants to remove the backend; willSave() handles cleanup.
+      const defaultBackendNameRequired = (name) => {
+        if (hasDefaultBackendService() && !name) {
+          return this.t('validation.required', { key: nameLabel });
+        }
+      };
+
+      const defaultBackendPortRequired = (port) => {
+        if (!hasDefaultBackendService()) {
+          return;
+        }
+
+        return portRequired(port);
+      };
+
+      return {
+        backEndOrRules,
+        portRequired,
+        portRange,
+        defaultBackendNameRequired,
+        defaultBackendPortRequired,
+      };
     },
     tabErrors() {
       return {
-        rules:          this.fvGetPathErrors(['spec.rules.host', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.port.number', 'spec.rules.http.paths.backend.service.name'])?.length > 0,
-        defaultBackend: this.fvGetPathErrors(['spec.defaultBackend.service.name', 'spec.defaultBackend.service.port.number'])?.length > 0
+        rules:          this.fvGetPathErrors(['spec.rules.host', 'spec.rules.http.paths.path', 'spec.rules.http.paths.backend.service.port', 'spec.rules.http.paths.backend.service.name'])?.length > 0,
+        defaultBackend: this.fvGetPathErrors(['spec.defaultBackend.service.name', 'spec.defaultBackend.service.port'])?.length > 0
       };
     },
     rulesPathRules() {
       return {
         requestHost: this.fvGetAndReportPathRules('spec.rules.host'),
         path:        this.fvGetAndReportPathRules('spec.rules.http.paths.path'),
-        port:        this.fvGetAndReportPathRules('spec.rules.http.paths.backend.service.port.number'),
+        port:        this.fvGetAndReportPathRules('spec.rules.http.paths.backend.service.port'),
         target:      this.fvGetAndReportPathRules('spec.rules.http.paths.backend.service.name'),
 
       };
     },
     defaultBackendPathRules() {
-      const rulesExist = (this.value?.spec?.rules || []).length > 0;
-      const defaultBackendExist = !!this.value?.spec?.defaultBackend?.service;
-
-      if (!rulesExist || defaultBackendExist) {
-        return {
-          name: this.fvGetAndReportPathRules('spec.defaultBackend.service.name'),
-          port: this.fvGetAndReportPathRules('spec.defaultBackend.service.port.number'),
-        };
-      }
-
-      return { name: [], port: [] };
+      return {
+        name: this.fvGetAndReportPathRules('spec.defaultBackend.service.name'),
+        port: this.fvGetAndReportPathRules('spec.defaultBackend.service.port'),
+      };
     },
     serviceTargets() {
       return this.ingressHelper.findAndMapServiceTargets(this.services);
@@ -188,7 +242,8 @@ export default {
     willSave() {
       const backend = get(this.value.spec, this.value.defaultBackendPath);
       const serviceName = get(backend, this.value.serviceNamePath);
-      const servicePort = get(backend, this.value.servicePortPath);
+      const servicePort = get(backend, this.value.servicePortPath) ||
+        get(backend, this.value.servicePortNamePath);
 
       if (backend && (!serviceName || !servicePort)) {
         const path = this.value.defaultBackendPath;

package/edit/nodeDriver.vue

@@ -21,7 +21,6 @@ export default {
     return {
       fvFormRuleSets: [
         { path: 'url', rules: ['required', 'url'] },
-        { path: 'uiUrl', rules: ['url'] },
         { path: 'checksum', rules: ['alphanumeric'] },
         { path: 'whitelistDomains', rules: ['wildcardHostname'] }
       ]
@@ -63,7 +62,6 @@ export default {
       :value="value"
       :rules="{
         url: fvGetAndReportPathRules('url'),
-        uiUrl: fvGetAndReportPathRules('uiUrl'),
         checksum: fvGetAndReportPathRules('checksum'),
         whitelistDomains: fvGetAndReportPathRules('whitelistDomains')
       }"

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

@@ -33,6 +33,7 @@ export default {
       :supported="(row) => typeof row.valueFrom === 'undefined'"
       :read-allowed="true"
       :value-can-be-empty="true"
+      :read-accept="'text/plain'"
       :key-label="t('cluster.agentEnvVars.keyLabel')"
       :parse-lines-from-file="true"
     />

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

@@ -0,0 +1,25 @@
+import { mount } from '@vue/test-utils';
+import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv.vue';
+
+describe('component: AgentEnv', () => {
+  it('should only accept text files (not binary) on the KeyValue file upload', () => {
+    const wrapper = mount(AgentEnv, {
+      props: {
+        mode:  'edit',
+        value: { spec: { agentEnvVars: [] } },
+      },
+      global: {
+        mocks: { t: (key: string) => key },
+        stubs: {
+          Tab:      { template: '<div><slot /></div>' },
+          KeyValue: true,
+        },
+      },
+    });
+
+    const keyValue = wrapper.findComponent({ name: 'KeyValue' });
+
+    expect(keyValue.exists()).toBe(true);
+    expect(keyValue.props('readAccept')).toBe('text/plain');
+  });
+});

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

@@ -0,0 +1,104 @@
+import { shallowMount } from '@vue/test-utils';
+import MachinePool from '@shell/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue';
+
+const TRANSLATION_KEY = '%cluster.machinePool.name.unique%';
+
+function createPool(name: string, { remove = false } = {}) {
+  return {
+    id:     `pool-${ name }`,
+    remove,
+    create: false,
+    update: true,
+    pool:   {
+      name,
+      etcdRole:         false,
+      controlPlaneRole: false,
+      workerRole:       true,
+      quantity:         1,
+    },
+    config: null,
+  };
+}
+
+function mountMachinePool(currentPool: ReturnType<typeof createPool>, allPools: ReturnType<typeof createPool>[]) {
+  return shallowMount(MachinePool, {
+    props: {
+      value:          currentPool,
+      mode:           'create',
+      provider:       'custom',
+      idx:            0,
+      machinePools:   allPools,
+      poolId:         currentPool.id,
+      poolCreateMode: true,
+    },
+    global: {
+      mocks: {
+        $store: {
+          getters: {
+            'i18n/t':                                   (key: string) => key,
+            'i18n/exists':                              () => false,
+            'type-map/hasCustomMachineConfigComponent': () => false,
+            'type-map/importMachineConfig':             () => null,
+            'features/get':                             () => false,
+          },
+          dispatch: jest.fn(),
+        },
+      },
+      stubs: {
+        LabeledInput:    true,
+        Checkbox:        true,
+        Taints:          true,
+        KeyValue:        true,
+        AdvancedSection: true,
+        Banner:          true,
+        UnitInput:       true,
+      },
+    },
+  });
+}
+
+describe('component: MachinePool', () => {
+  describe('uniquePoolName validation', () => {
+    it('should return undefined when the name is empty', () => {
+      const pool = createPool('');
+      const wrapper = mountMachinePool(pool, [pool]);
+
+      expect(wrapper.vm.fvExtraRules.uniquePoolName('')).toBeUndefined();
+    });
+
+    it('should return undefined when the pool name is unique', () => {
+      const pool1 = createPool('pool1');
+      const pool2 = createPool('pool2');
+      const wrapper = mountMachinePool(pool1, [pool1, pool2]);
+
+      expect(wrapper.vm.fvExtraRules.uniquePoolName('pool1')).toBeUndefined();
+    });
+
+    it('should return an error message when the pool name is duplicated', () => {
+      const pool1 = createPool('same-name');
+      const pool2 = createPool('same-name');
+      const wrapper = mountMachinePool(pool1, [pool1, pool2]);
+
+      expect(wrapper.vm.fvExtraRules.uniquePoolName('same-name')).toStrictEqual(TRANSLATION_KEY);
+    });
+
+    it('should ignore pools marked for removal', () => {
+      const pool1 = createPool('same-name');
+      const pool2 = createPool('same-name', { remove: true });
+      const wrapper = mountMachinePool(pool1, [pool1, pool2]);
+
+      expect(wrapper.vm.fvExtraRules.uniquePoolName('same-name')).toBeUndefined();
+    });
+
+    it.each([
+      ['Pool1', 'pool1'],
+      ['POOL', 'pool'],
+    ])('should flag names that differ only by case as duplicates (%s vs %s)', (nameA, nameB) => {
+      const pool1 = createPool(nameA);
+      const pool2 = createPool(nameB);
+      const wrapper = mountMachinePool(pool1, [pool1, pool2]);
+
+      expect(wrapper.vm.fvExtraRules.uniquePoolName(nameA)).toStrictEqual(TRANSLATION_KEY);
+    });
+  });
+});

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

@@ -4,9 +4,8 @@ import Loading from '@shell/components/Loading';
 import { Banner } from '@components/Banner';
 import CruResource from '@shell/components/CruResource';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
-import EmberPage from '@shell/components/EmberPage';
 import {
-  CHART, FROM_CLUSTER, SUB_TYPE, RKE_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW
+  CHART, FROM_CLUSTER, SUB_TYPE, RKE_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW, _CREATE
 } from '@shell/config/query-params';
 import { mapGetters } from 'vuex';
 import { sortBy } from '@shell/utils/sort';
@@ -18,8 +17,8 @@ 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';
+import { KONTAINER_TO_DRIVER } from '@shell/models/management.cattle.io.kontainerdriver';
 import Rke2Config from './rke2';
-import { DRIVER_TO_IMPORT } from '@shell/models/management.cattle.io.kontainerdriver';
 import { requireAsset } from '@shell/utils/require-asset';
 
 const SORT_GROUPS = {
@@ -44,7 +43,6 @@ export default {
 
   components: {
     CruResource,
-    EmberPage,
     Loading,
     Rke2Config,
     SelectIconGrid,
@@ -82,16 +80,20 @@ export default {
   },
 
   async fetch() {
-    const hash = {
-      // These aren't explicitly used, but need to be listening for change events
-      mgmtClusters: this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }),
-      provClusters: this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-    };
+    const hash = {};
+
+    if (this.mode === _CREATE) {
+      // After we create we wait for these to exist, so start watching
+      await this.$store.dispatch('management/watch', { type: MANAGEMENT.CLUSTER, registerType: true });
+      await this.$store.dispatch('management/watch', { type: CAPI.RANCHER_CLUSTER, registerType: true });
+    } else {
+      hash.mgmtClusters = this.value.waitForMgmt();
+    }
 
     // No need to fetch charts when editing an RKE1 cluster
     // The computed property `isRke1` in this file is based on the RKE1/RKE2 toggle, which is not applicable in this case
     // Instead, we should rely on the value from the model: `this.value.isRke1`
-    if (!this.value.isRke1 || (this.value.isRke1 && this.mode !== 'edit')) {
+    if (!this.value.isRke1 || (this.value.isRke1 && this.mode !== _EDIT)) {
       hash['catalog'] = this.$store.dispatch('catalog/load');
     }
 
@@ -103,19 +105,6 @@ 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.
-      if (this.$store.getters[`management/canList`](MANAGEMENT.NODE_POOL)) {
-        hash.rke1NodePools = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_POOL });
-      }
-
-      if (this.$store.getters[`management/canList`](MANAGEMENT.NODE_TEMPLATE)) {
-        hash.rke1NodeTemplates = this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
-      }
-    }
-
     const res = await allHash(hash);
 
     this.nodeDrivers = res.nodeDrivers || [];
@@ -172,11 +161,50 @@ export default {
     if ( this.$route.query[SUB_TYPE]) {
       subType = this.$route.query[SUB_TYPE];
     } else if (this.value.isImported) {
+      // Default imported clusters to the generic imported subType.
+      // Imported hosted clusters (e.g. AKS, EKS, GKE) that have an extension-provided
+      // component will be overridden below to load the correct custom form.
       subType = IMPORTED;
     } else if (this.value.isLocal) {
       subType = LOCAL;
     }
 
+    // For imported hosted clusters, check if the provisioner has a matching extension
+    // component and override the subType so the correct custom form loads instead of
+    // the generic imported configuration page.
+    if (subType === IMPORTED && this.value?.id && this.value.provisioner) {
+      const provisionerLower = this.value.provisioner.toLowerCase();
+      const hasExtension = this.extensions.some((ext) => ext.id === provisionerLower);
+
+      if (hasExtension) {
+        subType = provisionerLower;
+      }
+    }
+
+    // Auto-detect subType for existing clusters being edited
+    if ( !subType && this.value?.id ) {
+      // Check for extension annotation first
+      const fromAnnotation = this.value.annotations?.[CAPI_ANNOTATIONS.UI_CUSTOM_PROVIDER];
+
+      if (fromAnnotation) {
+        subType = fromAnnotation;
+      } else if ( this.value.isRke2 ) {
+        // For custom RKE2 clusters
+        if ( this.value.isCustom && (this.realMode === _EDIT || (this.as === _CONFIG && this.realMode === _VIEW)) ) {
+          subType = 'custom';
+        } else if ( this.value.machineProvider ) {
+          // For RKE2/K3s clusters provisioned in Rancher, use the machine pool provisioner
+          subType = this.value.machineProvider;
+        }
+      } else if ( this.value.provisioner ) {
+        // For non-RKE2 clusters, try to match against extension-provided subtypes
+        const provisionerLower = this.value.provisioner.toLowerCase();
+
+        // This will be checked against available subtypes after they're computed
+        subType = provisionerLower;
+      }
+    }
+
     this.subType = subType;
   },
 
@@ -217,74 +245,6 @@ export default {
     },
     _RKE2: () => _RKE2,
 
-    emberLink() {
-      if (this.value) {
-        // set subtype if editing EKS/GKE/AKS cluster -- this ensures that the component provided by extension is loaded instead of iframing old ember ui
-        if (this.value.provisioner) {
-          const matchingSubtype = this.subTypes.find((st) => {
-            const typeLower = st.id.toLowerCase();
-            const provisionerLower = this.value.provisioner.toLowerCase();
-
-            // This allows extensions to provide type for edit without breaking edit for Ember kontainer providers
-            return (!!st.component && (typeLower === provisionerLower)) || (DRIVER_TO_IMPORT[typeLower] === provisionerLower);
-          });
-
-          if (matchingSubtype) {
-            this.selectType(matchingSubtype.id, false);
-          }
-        }
-
-        // subType set by the ui during cluster creation
-        // this is likely from a ui extension trying to load custom ui to edit the cluster
-        const fromAnnotation = this.value.annotations?.[CAPI_ANNOTATIONS.UI_CUSTOM_PROVIDER];
-
-        if (fromAnnotation) {
-          this.selectType(fromAnnotation, false);
-
-          return '';
-        }
-
-        // For custom RKE2 clusters, don't load an Ember page.
-        // It should be the dashboard.
-        if ( this.value.isRke2 && ((this.value.isCustom && this.mode === _EDIT) || (this.value.isCustom && this.as === _CONFIG && this.mode === _VIEW) || (this.subType || '').toLowerCase() === 'custom')) {
-          // For admins, this.value.isCustom is used to check if it is a custom cluster.
-          // For cluster owners, this.subtype is used.
-          this.selectType('custom', false);
-
-          return '';
-        }
-        // For existing RKE2/K3s clusters provisioned in Rancher,
-        // set the subtype using the machine pool provisioner
-        // do not use an iFramed Ember page.
-        if ( this.value.isRke2 && this.value.machineProvider ) {
-          this.selectType(this.value.machineProvider, false);
-
-          return '';
-        }
-
-        if ( this.subType ) {
-          // if driver type has a custom form component, don't load an ember page
-          if (this.selectedSubType?.component) {
-            return '';
-          }
-          // For RKE1 and hosted Kubernetes Clusters, set the ember link
-          // so that we load the page rather than using RKE2 create
-          if (this.selectedSubType?.emberLink) {
-            return this.selectedSubType.emberLink;
-          }
-
-          return '';
-        }
-
-        if ( this.value.mgmt?.emberEditPath ) {
-          // Iframe an old page
-          return this.value.mgmt.emberEditPath;
-        }
-      }
-
-      return '';
-    },
-
     rke2Enabled: mapFeature(RKE2_FEATURE),
 
     // todo nb is this info stored anywhere else..?
@@ -310,6 +270,24 @@ export default {
       return this.value.isRke2;
     },
 
+    isEmberKontainerDriver() {
+      // RKE2/K3s clusters are never legacy Ember kontainer drivers
+      if (!this.value?.id || !this.value?.provisioner || this.value.isRke2) {
+        return false;
+      }
+
+      const provisioner = this.value.provisioner.toLowerCase();
+      // Resolve the provisioner to a driver name using the KONTAINER_TO_DRIVER map
+      const resolvedName = KONTAINER_TO_DRIVER[provisioner] || provisioner;
+
+      const driver = this.kontainerDrivers.find((d) => {
+        return d.driverName === resolvedName || d.driverName === provisioner || d.id === provisioner;
+      });
+
+      // If the driver exists and is not built-in, it's a legacy ember driver
+      return !!driver && !driver.spec?.builtIn;
+    },
+
     templateOptions() {
       if ( !this.rke2Enabled ) {
         return [];
@@ -327,16 +305,14 @@ export default {
       let out = [];
 
       const templates = this.templateOptions;
-      const vueKontainerTypes = getters['plugins/clusterDrivers'];
       const machineTypes = this.nodeDrivers.filter((x) => x.spec.active && x.state === 'active');
 
-      // Keeping this for non Rancher-managed kontainer drivers
+      // Kontainer drivers that don't have an extension-provided component are legacy Ember-based
+      // and no longer functional. Show them as disabled with an informational tooltip.
+      const emberRemovalTooltip = getters['i18n/t']('drivers.kontainer.emberRemovalTooltip');
+
       this.kontainerDrivers.filter((x) => (isImport ? x.showImport : x.showCreate)).forEach((obj) => {
-        if ( vueKontainerTypes.includes(obj.driverName) ) {
-          addType(this.$extension, obj.driverName, 'hosted', false);
-        } else {
-          addType(this.$extension, obj.driverName, 'hosted', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
-        }
+        addType(this.$extension, obj.driverName, 'hosted', true, undefined, undefined, emberRemovalTooltip);
       });
       if (!isImport) {
         templates.forEach((chart) => {
@@ -360,7 +336,7 @@ export default {
           machineTypes.forEach((type) => {
             const id = type.spec.displayName || type.id;
 
-            addType(this.$extension, id, _RKE2, false, null, undefined, type);
+            addType(this.$extension, id, _RKE2, false, undefined, type);
           });
 
           addType(this.$extension, 'custom', 'custom2', false);
@@ -409,7 +385,7 @@ export default {
         out.push(subtype);
       }
 
-      function addType(plugin, id, group, disabled = false, emberLink = null, iconClass = undefined, providerConfig = undefined) {
+      function addType(plugin, id, group, disabled = false, iconClass = undefined, providerConfig = undefined, tooltip = undefined) {
         const label = getters['i18n/withFallback'](`cluster.provider."${ id }"`, null, id);
         const description = getters['i18n/withFallback'](`cluster.providerDescription."${ id }"`, null, '');
         const tag = '';
@@ -439,8 +415,8 @@ export default {
           iconClass,
           group,
           disabled,
-          emberLink,
           tag,
+          tooltip,
           providerConfig
         };
 
@@ -594,12 +570,11 @@ export default {
     />
   </div>
   <div
-    v-else-if="emberLink"
-    class="embed"
+    v-else-if="isEmberKontainerDriver"
   >
-    <EmberPage
-      :force-new="true"
-      :src="emberLink"
+    <Banner
+      color="warning"
+      label-key="drivers.kontainer.emberRemovalMessage"
     />
   </div>
   <CruResource

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

@@ -174,7 +174,7 @@ export default {
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
 
-      this.set(this.userChartValues, key, value);
+      this.userChartValues[key] = value;
     });
     this.setAgentConfiguration();
   },
@@ -298,6 +298,7 @@ export default {
       isEmpty,
       AGENT_CONFIGURATION_TYPES,
       basicsValid:                              true,
+      registryConfigValid:                      true,
       originalIngressController:                this.value.spec.rkeConfig.machineGlobalConfig?.[INGRESS_CONTROLLER] || INGRESS_NONE,
     };
   },
@@ -906,7 +907,8 @@ export default {
       return this.validationPassed &&
             this.fvFormIsValid &&
             this.etcdConfigValid &&
-            this.basicsValid;
+            this.basicsValid &&
+            this.registryConfigValid;
     },
     nginxSupported() {
       if (this.serverArgs?.disable?.options.includes(RKE2_INGRESS_NGINX)) {
@@ -2518,14 +2520,14 @@ export default {
           >
             <template
               v-for="(obj, idx) in machinePools"
-              :key="idx"
+              :key="obj.id"
             >
               <Tab
                 v-if="!obj.remove"
                 :key="obj.id"
                 :weight="-1 * idx"
                 :name="obj.id"
-                :label="obj.pool.name || '(Not Named)'"
+                :label="obj.pool.name || t('cluster.machinePool.name.notNamed')"
                 :show-header="false"
                 :error="!machinePoolValidation[obj.id]"
               >
@@ -2688,6 +2690,7 @@ export default {
           <Tab
             :name="REGISTRIES_TAB_NAME"
             label-key="cluster.tabs.registry"
+            :error="!registryConfigValid"
           >
             <Registries
               v-if="isActiveTabRegistries"
@@ -2703,6 +2706,7 @@ export default {
               @custom-registry-changed="toggleCustomRegistry"
               @registry-host-changed="handleRegistryHostChanged"
               @registry-secret-changed="handleRegistrySecretChanged"
+              @registry-validation-changed="(val) => registryConfigValid = val"
             />
           </Tab>
 

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

@@ -106,6 +106,16 @@ export default {
           const max = this.value?.pool?.autoscalingMaxSize || 0;
 
           return max - min >= 0 ? undefined : this.t('cluster.machinePool.autoscaler.validation.isAutoscalerMaxGreaterThanMin');
+        },
+        uniquePoolName: (name) => {
+          if (!name) {
+            return undefined;
+          }
+
+          const otherPools = (this.machinePools || []).filter((p) => !p.remove && p !== this.value);
+          const isDuplicate = otherPools.some((p) => p.pool.name?.toLowerCase() === name.toLowerCase());
+
+          return isDuplicate ? this.t('cluster.machinePool.name.unique') : undefined;
         }
       }
     };
@@ -295,6 +305,7 @@ export default {
           :label="t('cluster.machinePool.name.label')"
           :required="true"
           :disabled="!value.config || !!value.config.id || busy"
+          :require-dirty="false"
           :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.NAME)"
           data-testid="machine-pool-name-input"
         />