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

package/edit/management.cattle.io.user.vue

@@ -174,7 +174,7 @@ export default {
         await wait(5000);
       }
 
-      const user = this.value.save();
+      const user = await this.value.save();
 
       return user;
     },
@@ -214,8 +214,10 @@ export default {
         return;
       }
 
+      const userId = user?.id || this.value.id;
+
       try {
-        await this.$refs.grb.save(user.id);
+        await this.$refs.grb.save(userId);
       } catch (err) {
         if (this.isCreate) {
           try {
@@ -245,6 +247,7 @@ export default {
     :can-yaml="false"
     class="create-edit"
     @finish="save"
+    @error="e=>errors = e"
   >
     <div class="credentials">
       <h2> {{ t("user.edit.credentials.label") }}</h2>

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

@@ -94,8 +94,8 @@ const NODE_TOTAL = {
 };
 const CLUSTER_AGENT_CUSTOMIZATION = 'clusterAgentDeploymentCustomization';
 const FLEET_AGENT_CUSTOMIZATION = 'fleetAgentDeploymentCustomization';
-
 const REGISTRIES_TAB_NAME = 'registry';
+const INIT_HOOKS = '_initHooks';
 
 const isAzureK8sUnsupported = (version) => semver.gte(version, '1.30.0');
 
@@ -274,6 +274,7 @@ export default {
       truncateLimit:                            this.value.defaultHostnameLengthLimit || 0,
       busy:                                     false,
       machinePoolValidation:                    {}, // map of validation states for each machine pool
+      infrastructureClusterValid:               true,
       machinePoolErrors:                        {},
       addonConfigValidation:                    {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
       stackPreferenceError:                     false, //  spec.networking.stackPreference is validated in conjunction with hasOnlyIpv6Pools
@@ -300,6 +301,7 @@ export default {
       basicsValid:                              true,
       registryConfigValid:                      true,
       originalIngressController:                this.value.spec.rkeConfig.machineGlobalConfig?.[INGRESS_CONTROLLER] || INGRESS_NONE,
+      infrastructureCluster:                    null,
     };
   },
 
@@ -329,6 +331,14 @@ export default {
       return this.provider === ELEMENTAL_CLUSTER_PROVIDER || this.value?.machineProvider?.toLowerCase() === KIND.MACHINE_INV_SELECTOR_TEMPLATES.toLowerCase();
     },
 
+    isUpstreamCAPIProvider() {
+      if (this.extensionProvider?.isUpstreamCAPIProvider !== undefined) {
+        return !!this.extensionProvider.isUpstreamCAPIProvider;
+      }
+
+      return false;
+    },
+
     chartValues() {
       return this.value.spec.rkeConfig.chartValues;
     },
@@ -548,7 +558,7 @@ export default {
           getters:    this.$store.getters,
           axios:      this.$store.$axios,
           $extension: this.$store.app.$extension,
-          $t:         this.t,
+          t:          (...args) => this.t.apply(this, args),
           isCreate:   this.isCreate
         });
       }
@@ -826,6 +836,10 @@ export default {
       return null;
     },
 
+    extensionInfrastructureSection() {
+      return this.extensionProvider?.extensionInfrastructureSection || null;
+    },
+
     showForm() {
       return !!this.credentialId || !this.needCredential;
     },
@@ -879,7 +893,9 @@ export default {
 
       const hasAddonConfigErrors = Object.values(this.addonConfigValidation).filter((v) => v === false).length > 0;
 
-      return validRequiredPools && base && !hasAddonConfigErrors && !this.stackPreferenceError;
+      const hasInfrastructureClusterError = this.isUpstreamCAPIProvider ? !this.infrastructureClusterValid : false;
+
+      return validRequiredPools && base && !hasAddonConfigErrors && !hasInfrastructureClusterError && !this.stackPreferenceError;
     },
 
     currentCluster() {
@@ -1015,6 +1031,11 @@ export default {
   },
 
   created() {
+    // Hooks to be run when cluster is getting initialized
+    if (this.extensionProvider?.registerInitHooks) {
+      this.extensionProvider.registerInitHooks(this.registerHook.bind(this, INIT_HOOKS), this.value);
+    }
+    // Other hooks to be run before/after saving the cluster
     this.registerBeforeHook(this.showIpv6Warning, 'show-ipv6-warning', 1);
     this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 2);
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
@@ -1033,6 +1054,21 @@ export default {
   methods: {
     set,
 
+    updateExtensionInfrastructureSection(neu) {
+      if (!neu || typeof neu !== 'object') {
+        return;
+      }
+
+      if (!this.infrastructureCluster || typeof this.infrastructureCluster !== 'object') {
+        this.infrastructureCluster = neu;
+
+        return;
+      }
+
+      // Preserve the original resource model instance while applying extension updates.
+      mergeWithReplace(this.infrastructureCluster, neu, { mutateOriginal: true });
+    },
+
     async handleVsphereCpiSecret() {
       return VsphereUtils.handleVsphereCpiSecret(this);
     },
@@ -1056,8 +1092,8 @@ export default {
       if (!this.value.spec.machineSelectorConfig.find((x) => !x.machineLabelSelector)) {
         this.value.spec.machineSelectorConfig.unshift({ config: {} });
       }
-
-      if (this.value.spec.cloudCredentialSecretName) {
+      // TODO handle upstream capi once credentials part is clear
+      if (this.value.spec.cloudCredentialSecretName ) {
         await this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
         this.credentialId = `${ this.value.spec.cloudCredentialSecretName }`;
       }
@@ -1106,6 +1142,9 @@ export default {
       if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
         set(this.value, 'spec.localClusterAuthEndpoint', { enabled: false });
       }
+
+      await this.applyHooks(INIT_HOOKS, this.value);
+      this.localValue = this.value;
     },
 
     /**
@@ -1281,6 +1320,10 @@ export default {
 
           if (this.isElementalCluster) {
             type = ELEMENTAL_SCHEMA_IDS.MACHINE_INV_SELECTOR_TEMPLATES;
+          } else if (this.isUpstreamCAPIProvider && pool.machineConfigRef?.apiVersion) {
+            const [group] = (pool.machineConfigRef.apiVersion || '').split('/');
+
+            type = `${ group }.${ pool.machineConfigRef.kind.toLowerCase() }`;
           } else {
             type = `${ CAPI.MACHINE_CONFIG_GROUP }.${ pool.machineConfigRef.kind.toLowerCase() }`;
           }
@@ -1386,10 +1429,20 @@ export default {
         pool.pool.machineOS = 'linux';
       }
 
-      if (this.isElementalCluster) {
+      if (this.isElementalCluster && this.machineConfigSchema?.attributes) {
         pool.pool.machineConfigRef.apiVersion = `${ this.machineConfigSchema.attributes.group }/${ this.machineConfigSchema.attributes.version }`;
       }
 
+      // Upstream CAPI MachineTemplate resources are referenced by full apiVersion so that
+      // initMachinePools can resolve the correct management store type on subsequent loads.
+      if (this.isUpstreamCAPIProvider && this.machineConfigSchema?.attributes) {
+        const { group, version } = this.machineConfigSchema.attributes;
+
+        if (group && version) {
+          pool.pool.machineConfigRef.apiVersion = `${ group }/${ version }`;
+        }
+      }
+
       this.machinePools.push(pool);
 
       this.$nextTick(() => {
@@ -1538,6 +1591,10 @@ export default {
     },
 
     async cleanupMachinePools() {
+      // Allow the extension provider to handle its own resource cleanup
+      if (this.extensionProvider?.cleanupMachinePools) {
+        return await this.extensionProvider.cleanupMachinePools(this.machinePools);
+      }
       for (const entry of this.machinePools) {
         if (entry.remove && entry.config) {
           try {
@@ -2349,7 +2406,8 @@ export default {
       if (this.errors) {
         clear(this.errors);
       }
-      if (this.value.cloudProvider === 'aws') {
+
+      if ( this.value.cloudProvider === 'aws') {
         const missingProfileName = this.machinePools.some((mp) => !mp.config.iamInstanceProfile);
 
         if (missingProfileName) {
@@ -2358,7 +2416,7 @@ export default {
       }
 
       for (const [index] of this.machinePools.entries()) { // validator machine config
-        if (typeof this.$refs.pool[index]?.test === 'function') {
+        if (typeof this.$refs.pool?.[index]?.test === 'function') {
           try {
             const res = await this.$refs.pool[index].test();
 
@@ -2475,7 +2533,22 @@ export default {
         >
           {{ appsOSWarning }}
         </Banner>
-
+        <div class="span-12">
+          <component
+            :is="extensionInfrastructureSection"
+            v-if="extensionInfrastructureSection"
+            :value="infrastructureCluster"
+            :mode="mode"
+            :provider="provider"
+            :credential-id="credentialId"
+            :provisioning-cluster="value"
+            data-testid="extension-top-section"
+            class="span-12"
+            @update:value="updateExtensionInfrastructureSection"
+            @error="e => errors.push(e)"
+            @validationChanged="(val) => infrastructureClusterValid = val"
+          />
+        </div>
         <!-- Pools Extras -->
         <template v-if="hasMachinePools">
           <div class="clearfix">
@@ -2509,7 +2582,6 @@ export default {
               />
             </div>
           </div>
-
           <!-- Extra Tabs for Machine Pool -->
           <Tabbed
             ref="pools"
@@ -2544,6 +2616,8 @@ export default {
                   :busy="busy"
                   :pool-id="obj.id"
                   :pool-create-mode="obj.create"
+                  :infrastructure-cluster="infrastructureCluster"
+                  :hide-advanced="isUpstreamCAPIProvider"
                   @error="handleMachinePoolError"
                   @validationChanged="v => machinePoolValidationChanged(obj.id, v)"
                 />

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

@@ -41,6 +41,11 @@ export default {
       default: () => ({})
     },
 
+    infrastructureCluster: {
+      type:    Object,
+      default: () => ({})
+    },
+
     // no credentials are required for elemental machine pools
     credentialId: {
       type:    String,
@@ -86,6 +91,10 @@ export default {
     poolCreateMode: {
       type:     Boolean,
       required: true,
+    },
+    hideAdvanced: {
+      type:    Boolean,
+      default: false
     }
   },
 
@@ -368,6 +377,7 @@ export default {
       v-model:is-ipv6="value.isIpv6"
       v-model:is-dualStack="value.isDualStack"
       :cluster="cluster"
+      :infrastructure-cluster="infrastructureCluster"
       :uuid="uuid"
       :mode="mode"
       :value="value.config"
@@ -396,6 +406,7 @@ export default {
     />
 
     <AdvancedSection
+      v-if="!hideAdvanced"
       ref="advanced"
       :mode="mode"
       class="advanced"

package/list/group.principal.vue

@@ -9,10 +9,11 @@ import { NAME } from '@shell/config/product/auth';
 import { MODE, _EDIT } from '@shell/config/query-params';
 import { mapState } from 'vuex';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { RcButton } from '@components/RcButton';
 
 export default {
   components: {
-    AsyncButton, ResourceTable, Masthead, Loading
+    AsyncButton, ResourceTable, Masthead, Loading, RcButton
   },
   props: {
     resource: {
@@ -130,13 +131,13 @@ export default {
           :class="{'mr-5': canCreateGlobalRoleBinding}"
           @click="refreshGroupMemberships"
         />
-        <router-link
+        <rc-button
           v-if="canCreateGlobalRoleBinding"
+          size="large"
           :to="assignLocation"
-          class="btn role-primary"
         >
           {{ t("authGroups.actions.assignRoles") }}
-        </router-link>
+        </rc-button>
       </template>
     </Masthead>
 

package/list/harvesterhci.io.management.cluster.vue

@@ -8,6 +8,7 @@ import { HARVESTER_NAME as VIRTUAL } from '@shell/config/features';
 import { CAPI, HCI, MANAGEMENT } from '@shell/config/types';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { allHash } from '@shell/utils/promise';
+import { RcButton } from '@components/RcButton';
 
 export default {
   components: {
@@ -15,7 +16,8 @@ export default {
     ResourceTable,
     Masthead,
     TypeDescription,
-    Loading
+    Loading,
+    RcButton,
   },
 
   props: {
@@ -128,12 +130,12 @@ export default {
         v-if="canCreateCluster"
         slot="extraActions"
       >
-        <n-link
+        <rc-button
           :to="importLocation"
-          class="btn role-primary"
+          size="large"
         >
           {{ t('cluster.importAction') }}
-        </n-link>
+        </rc-button>
       </template>
     </Masthead>
 
@@ -166,12 +168,9 @@ export default {
       </template>
 
       <template #cell:harvester="{row}">
-        <n-link
-          class="btn btn-sm role-primary"
-          :to="row.detailLocation"
-        >
+        <rc-button :to="row.detailLocation">
           {{ t('harvesterManager.manage') }}
-        </n-link>
+        </rc-button>
       </template>
     </ResourceTable>
     <div v-else>

package/list/management.cattle.io.user.vue

@@ -7,6 +7,7 @@ import Masthead from '@shell/components/ResourceList/Masthead';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { isAdminUser } from '@shell/store/type-map';
 import TableDataUserIcon from '@shell/components/TableDataUserIcon';
+import { RcButton } from '@components/RcButton';
 
 export default {
   components: {
@@ -14,6 +15,7 @@ export default {
     ResourceTable,
     Masthead,
     TableDataUserIcon,
+    RcButton
   },
   mixins: [ResourceFetch],
   props:  {
@@ -128,14 +130,17 @@ export default {
         v-if="isAdmin"
         #subHeader
       >
-        <router-link
+        <rc-button
+          variant="link"
+          class="btn-user-retention"
           :to="{ name: 'c-cluster-auth-user.retention'}"
-          class="btn role-link btn-sm btn-user-retention"
           data-testid="router-link-user-retention"
         >
-          <i class="icon icon-gear" />
+          <template #before>
+            <i class="icon icon-gear" />
+          </template>
           {{ t('user.retention.button.label') }}
-        </router-link>
+        </rc-button>
       </template>
     </Masthead>
 
@@ -159,10 +164,8 @@ export default {
   </div>
 </template>
 
-<style lang="scss">
-  .btn-user-retention {
-    display: flex;
-    gap: 0.25rem;
-    padding: 0;
+<style lang="scss" scoped>
+  a.rc-button.variant-link.btn-user-retention {
+    padding: 0; //retain the padding override for left-alignment with the header
   }
 </style>

package/list/provisioning.cattle.io.cluster.vue

@@ -17,10 +17,15 @@ import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
 import ManagementClusterUtils from '@shell/list/utils/management.cattle.io.cluster.utils';
 import { STEVE_AUTOSCALER_ENABLED } from '@shell/config/pagination-table-headers';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters } from '@shell/utils/cluster';
+import { RcButton } from '@components/RcButton';
 
 export default {
   components: {
-    Banner, PaginatedResourceTable, Masthead, MachineSummaryGraph
+    Banner,
+    PaginatedResourceTable,
+    Masthead,
+    MachineSummaryGraph,
+    RcButton,
   },
 
   data() {
@@ -289,13 +294,14 @@ export default {
           v-if="canImport"
           #extraActions
         >
-          <router-link
+          <rc-button
+            size="large"
+            class="mr-10"
             :to="importLocation"
-            class="btn role-primary mr-10"
             data-testid="cluster-manager-list-import"
           >
             {{ t('cluster.importAction') }}
-          </router-link>
+          </rc-button>
         </template>
       </Masthead>
 
@@ -329,22 +335,22 @@ export default {
         </template>
         <template #cell:explorer="{row}">
           <!-- Align side nav cluster, home page name link and cluster management cluster explor buttons on canExplore -->
-          <router-link
+          <rc-button
             v-if="row.canExplore"
+            variant="secondary"
             data-testid="cluster-manager-list-explore-management"
-            class="btn btn-sm role-secondary"
             :to="{name: 'c-cluster', params: {cluster: row.id}}"
           >
             {{ t('cluster.explore') }}
-          </router-link>
-          <button
+          </rc-button>
+          <rc-button
             v-else
+            variant="secondary"
             data-testid="cluster-manager-list-explore"
             :disabled="true"
-            class="btn btn-sm role-secondary"
           >
             {{ t('cluster.explore') }}
-          </button>
+          </rc-button>
         </template>
       </PaginatedResourceTable>
     </template>

package/mixins/__tests__/auth-config.test.ts

@@ -69,4 +69,94 @@ describe('mixin: authConfigMixin', () => {
       expect(instance.model.scope).toStrictEqual(scope);
     });
   });
+
+  describe('accessMode on enable', () => {
+    const FakeComponent = {
+      render() {},
+      mixins:  [authConfigMixin, childHook],
+      methods: { applyHooks: jest.fn() },
+    };
+
+    const createMock = (model: any, overrides: Record<string, any> = {}) => ({
+      data: () => ({
+        value: { configType: 'oidc' },
+        model,
+        ...overrides,
+      }),
+      computed: { principal: () => ({ me: {} }) },
+      global:   {
+        mocks: {
+          $store: { dispatch: () => model },
+          $route: {
+            params: { id: model.id || '123' },
+            query:  { mode: 'edit' },
+          },
+        }
+      }
+    });
+
+    it.each([
+      'github',
+      'githubapp',
+    ])('should default accessMode to restricted for %s on enable', async(id) => {
+      const model = {
+        id,
+        enabled:        false,
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           jest.fn(),
+      };
+      const instance = mount(FakeComponent, createMock(model)).vm as any;
+
+      await instance.save(jest.fn());
+
+      expect(model.save).toHaveBeenCalled();
+      expect(instance.model.accessMode).toStrictEqual('required');
+    });
+
+    it('should default accessMode to unrestricted for non-github oauth on enable', async() => {
+      const model = {
+        id:             'googleoauth',
+        enabled:        false,
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           jest.fn(),
+      };
+      const instance = mount(FakeComponent, createMock(model)).vm as any;
+
+      await instance.save(jest.fn());
+
+      expect(instance.model.accessMode).toStrictEqual('required');
+    });
+
+    it('should set accessMode to required after enabling a provider', async() => {
+      const model = {
+        enabled:        false,
+        accessMode:     'unrestricted',
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           async() => {}
+      };
+      const instance = mount(FakeComponent, createMock(model)).vm as any;
+
+      await instance.save(jest.fn());
+
+      expect(instance.model.accessMode).toStrictEqual('required');
+    });
+
+    it('should not change accessMode when editing an already enabled provider', async() => {
+      const model = {
+        enabled:        true,
+        accessMode:     'unrestricted',
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           async() => {}
+      };
+      const instance = mount(FakeComponent, createMock(model, { editConfig: true })).vm as any;
+
+      await instance.save(jest.fn());
+
+      expect(instance.model.accessMode).toStrictEqual('unrestricted');
+    });
+  });
 });

package/mixins/__tests__/chart.test.ts

@@ -581,5 +581,99 @@ describe('chartMixin', () => {
         '0.0.1'
       ]);
     });
+
+    it('should correctly format current version when it is Linux-only', () => {
+      const versions = [
+        {
+          version:     '1.0.0',
+          created:     '2026-01-01',
+          annotations: { 'catalog.cattle.io/permits-os': 'linux' }
+        }
+      ];
+
+      const mockStore = {
+        dispatch: jest.fn(() => Promise.resolve()),
+        getters:  {
+          currentCluster:  () => ({ workerOSs: ['linux'] }),
+          isRancher:       () => true,
+          'catalog/repo':  () => () => 'repo',
+          'catalog/chart': () => ({ versions }),
+          'prefs/get':     () => () => true,
+          'i18n/t':        () => jest.fn()
+        }
+      };
+
+      const DummyComponent = {
+        mixins:   [ChartMixin],
+        template: '<div></div>',
+      };
+
+      const wrapper = mount(
+        DummyComponent,
+        {
+          data: () => ({
+            chart:    { versions },
+            existing: { spec: { chart: { metadata: { version: '1.0.0' } } } }
+          }),
+          global: {
+            mocks: {
+              $store: mockStore,
+              $route: { query: { version: '1.0.0' } },
+              t:      (key: string, args: any) => `${ args?.ver } (Current, Linux-only)`
+            }
+          }
+        });
+
+      const result = (wrapper.vm as any).mappedVersions;
+
+      expect(result[0].label).toBe('1.0.0 (Current, Linux-only)');
+    });
+
+    it('should correctly format current version when it is not OS-restricted', () => {
+      const versions = [
+        {
+          version:     '1.0.0',
+          created:     '2026-01-01',
+          annotations: {}
+        }
+      ];
+
+      const mockStore = {
+        dispatch: jest.fn(() => Promise.resolve()),
+        getters:  {
+          currentCluster:  () => ({ workerOSs: ['linux'] }),
+          isRancher:       () => true,
+          'catalog/repo':  () => () => 'repo',
+          'catalog/chart': () => ({ versions }),
+          'prefs/get':     () => () => true,
+          'i18n/t':        () => jest.fn()
+        }
+      };
+
+      const DummyComponent = {
+        mixins:   [ChartMixin],
+        template: '<div></div>',
+      };
+
+      const wrapper = mount(
+        DummyComponent,
+        {
+          data: () => ({
+            chart:    { versions },
+            existing: { spec: { chart: { metadata: { version: '1.0.0' } } } }
+          }),
+          global: {
+            mocks: {
+              $store: mockStore,
+              $route: { query: { version: '1.0.0' } },
+              t:      (key: string, args: any) => `${ args?.ver } (Current)`
+            }
+          }
+        });
+
+      const result = (wrapper.vm as any).mappedVersions;
+
+      expect(result[0].label).toBe('1.0.0 (Current)');
+    });
   });
 });