@rancher/shell 3.0.10 → 3.0.12-rc.1

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

@@ -0,0 +1,176 @@
+import { mount } from '@vue/test-utils';
+import Ingress from '@shell/edit/provisioning.cattle.io.cluster/tabs/Ingress.vue';
+import { _EDIT } from '@shell/config/query-params';
+import { INGRESS_DUAL, TRAEFIK, INGRESS_NGINX, INGRESS_NONE } from '@shell/edit/provisioning.cattle.io.cluster/shared';
+
+jest.mock('vuex', () => ({
+  useStore:   () => ({ getters: { 'i18n/t': (key: string) => key } }),
+  mapGetters: () => ({ t: (key: string) => key })
+}));
+
+jest.mock('@shell/edit/provisioning.cattle.io.cluster/shared', () => ({
+
+  INGRESS_NGINX:   'ingress-nginx',
+  TRAEFIK:         'traefik',
+  INGRESS_DUAL:    'dual',
+  INGRESS_NONE:    'none',
+  INGRESS_OPTIONS: [{
+    id:        'traefik',
+    image:     { src: '', alt: 'Traefik' },
+    header:    { title: { key: 'cluster.ingress.traefik.header' } },
+    subHeader: { label: { key: 'cluster.ingress.recommended' } },
+    content:   { key: 'cluster.ingress.traefik.content' },
+    doc:       { url: 'https://docs.rke2.io/networking/networking_services?_highlight=ingress#ingress-controller' }
+  },
+  {
+    id:        'ingress-nginx',
+    image:     { src: '', alt: 'NGINX' },
+    header:    { title: { key: 'cluster.ingress.nginx.header' } },
+    subHeader: { label: { key: 'cluster.ingress.legacy' } },
+    content:   { key: 'cluster.ingress.nginx.content' },
+    doc:       { url: 'https://www.kubernetes.dev/blog/2025/11/12/ingress-nginx-retirement/' }
+  },
+  {
+    id:        'dual',
+    header:    { title: { key: 'cluster.ingress.dual.header' } },
+    subHeader: { label: { key: 'cluster.ingress.migration' } },
+    content:   { key: 'cluster.ingress.dual.content' }
+  }],
+  INGRESS_MIGRATION_KB_LINK:          'mock-link',
+  INGRESS_CONTROLLER_CLASS_MIGRATION: 'rke2.cattle.io/ingress-nginx-migration',
+  INGRESS_CLASS_DEFAULT:              'rke2.cattle.io/ingress-nginx-default',
+  INGRESS_CONTROLLER_CLASS_DEFAULT:   'rke2.cattle.io/ingress-nginx-controller-default',
+  INGRESS_CLASS_MIGRATION:            'rke2.cattle.io/ingress-nginx-migration'
+}));
+
+describe('ingress.vue', () => {
+  const defaultProps = {
+    mode:             _EDIT,
+    value:            INGRESS_NONE,
+    nginxSupported:   true,
+    traefikSupported: true,
+    nginxChart:       'rancher-ingress-nginx',
+    traefikChart:     'traefik',
+    userChartValues:  {},
+    versionInfo:      {
+      'rancher-ingress-nginx': { values: {} },
+      traefik:                 { values: {} }
+    }
+  };
+
+  const createWrapper = (props = {}) => mount(Ingress, {
+    props:  { ...defaultProps, ...props },
+    global: {
+      stubs: {
+        Checkbox:             true,
+        Banner:               true,
+        IngressCards:         true,
+        IngressConfiguration: true,
+        YamlEditor:           true,
+        RichTranslation:      true
+      }
+    }
+  });
+
+  it('renders checkbox to enable/disable ingress', () => {
+    const wrapper = createWrapper();
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    expect(checkbox.exists()).toBe(true);
+  });
+
+  it('emits update:value with INGRESS_NONE when ingress is disabled', async() => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', false);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NONE]);
+  });
+
+  it('emits update:value with TRAEFIK when ingress is enabled and traefik is supported', async() => {
+    const wrapper = createWrapper({ value: INGRESS_NONE });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', true);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([TRAEFIK]);
+  });
+
+  it('emits update:value with INGRESS_NGINX when ingress is enabled, traefik is NOT supported, and nginx IS supported', async() => {
+    const wrapper = createWrapper({ value: INGRESS_NONE, traefikSupported: false });
+    const checkbox = wrapper.findComponent({ name: 'Checkbox' });
+
+    await checkbox.vm.$emit('update:value', true);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+  });
+
+  it('selectIngress emits [INGRESS_NGINX, TRAEFIK] string value when INGRESS_DUAL is selected and previous value was ingress-nginx', () => {
+    const wrapper = createWrapper({ value: INGRESS_NGINX, originalIngressController: INGRESS_NGINX });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([[INGRESS_NGINX, TRAEFIK]]);
+  });
+
+  it('selectIngress emits [TRAEFIK, INGRESS_NGINX] string value when INGRESS_DUAL is selected and previous value was traefik', () => {
+    const wrapper = createWrapper({ value: TRAEFIK, originalIngressController: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([[TRAEFIK, INGRESS_NGINX]]);
+  });
+
+  it('selectIngress emits [TRAEFIK, INGRESS_NGINX] string value when INGRESS_DUAL is selected and  value went traefik -> nginx -> dual', () => {
+    const wrapper = createWrapper({ value: TRAEFIK, originalIngressController: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_NGINX);
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+
+    ingressCards.vm.$emit('select', INGRESS_DUAL);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[1]).toStrictEqual([[TRAEFIK, INGRESS_NGINX]]);
+  });
+
+  it('selectIngress emits string value when a single ingress is selected', () => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const ingressCards = wrapper.findComponent({ name: 'IngressCards' });
+
+    ingressCards.vm.$emit('select', INGRESS_NGINX);
+
+    expect(wrapper.emitted('update:value')).toBeTruthy();
+    expect(wrapper.emitted('update:value')?.[0]).toStrictEqual([INGRESS_NGINX]);
+  });
+
+  it('renders IngressConfiguration when versionInfo contains chart values', () => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+    const config = wrapper.findComponent({ name: 'IngressConfiguration' });
+
+    expect(config.exists()).toBe(true);
+  });
+
+  it('toggles advanced configuration visibility and renders YamlEditor', async() => {
+    const wrapper = createWrapper({ value: TRAEFIK });
+
+    expect(wrapper.findComponent({ name: 'YamlEditor' }).exists()).toBe(false);
+
+    const advancedButton = wrapper.find('.advanced-toggle');
+
+    await advancedButton.trigger('click');
+
+    const yamlEditor = wrapper.find('[data-testid="traefik-yaml-editor"]');
+
+    expect(yamlEditor.exists()).toBe(true);
+  });
+});

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

@@ -20,6 +20,7 @@ import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 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 = {
   template:  1,
@@ -343,7 +344,7 @@ export default {
             id:          `chart:${ chart.id }`,
             label:       chart.chartNameDisplay,
             description: chart.chartDescription,
-            icon:        chart.icon || require('~shell/assets/images/generic-catalog.svg'),
+            icon:        chart.icon || requireAsset('~shell/assets/images/generic-catalog.svg'),
             group:       'template',
             tag:         getters['i18n/t']('generic.techPreview')
           });
@@ -389,7 +390,7 @@ export default {
         if (icon) {
           iconClass = undefined;
         } else if (!iconClass) {
-          icon = require('~shell/assets/images/generic-driver.svg');
+          icon = requireAsset('~shell/assets/images/generic-driver.svg');
         }
 
         const subtype = {
@@ -420,14 +421,14 @@ export default {
 
         if (!icon) {
           try {
-            icon = require(`~shell/assets/images/providers/${ id }.svg`);
+            icon = requireAsset(`~shell/assets/images/providers/${ id }.svg`);
           } catch (e) {}
         }
 
         if (icon) {
           iconClass = undefined;
         } else if (!iconClass) {
-          icon = require('~shell/assets/images/generic-driver.svg');
+          icon = requireAsset('~shell/assets/images/generic-driver.svg');
         }
 
         const subtype = {

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

@@ -297,7 +297,8 @@ export default {
       originalKubeVersion:                      null,
       isEmpty,
       AGENT_CONFIGURATION_TYPES,
-      basicsValid:                              true
+      basicsValid:                              true,
+      originalIngressController:                this.value.spec.rkeConfig.machineGlobalConfig?.[INGRESS_CONTROLLER] || INGRESS_NONE,
     };
   },
 
@@ -2522,6 +2523,7 @@ export default {
               <Tab
                 v-if="!obj.remove"
                 :key="obj.id"
+                :weight="-1 * idx"
                 :name="obj.id"
                 :label="obj.pool.name || '(Not Named)'"
                 :show-header="false"
@@ -2592,6 +2594,7 @@ export default {
               :is-azure-provider-unsupported="isAzureProviderUnsupported"
               :can-azure-migrate-on-edit="canAzureMigrateOnEdit"
               :has-some-ipv6-pools="hasOnlyIpv6Pools"
+              :original-ingress-controller="originalIngressController"
               @update:value="$emit('input', $event)"
               @cilium-values-changed="handleCiliumValuesChanged"
               @enabled-system-services-changed="handleEnabledSystemServicesChanged"

package/edit/provisioning.cattle.io.cluster/shared.ts

@@ -1,3 +1,5 @@
+import { requireAsset } from '@shell/utils/require-asset';
+
 export const RETENTION_DEFAULT = 5;
 export const RKE2_INGRESS_NGINX = 'rke2-ingress-nginx';
 export const RKE2_TRAEFIK = 'rke2-traefik';
@@ -10,7 +12,7 @@ export const INGRESS_NONE = 'none';
 export const INGRESS_OPTIONS = [
   {
     id:        TRAEFIK,
-    image:     { src: require('@shell/assets/images/providers/traefik.png'), alt: 'Traefik' },
+    image:     { src: requireAsset('@shell/assets/images/providers/traefik.png'), alt: 'Traefik' },
     header:    { title: { key: 'cluster.ingress.traefik.header' } },
     subHeader: { label: { key: 'cluster.ingress.recommended' } },
     content:   { key: 'cluster.ingress.traefik.content' },
@@ -18,7 +20,7 @@ export const INGRESS_OPTIONS = [
   },
   {
     id:        INGRESS_NGINX,
-    image:     { src: require('@shell/assets/images/providers/kubernetes.svg'), alt: 'NGINX' },
+    image:     { src: requireAsset('@shell/assets/images/providers/kubernetes.svg'), alt: 'NGINX' },
     header:    { title: { key: 'cluster.ingress.nginx.header' } },
     subHeader: { label: { key: 'cluster.ingress.legacy' } },
     content:   { key: 'cluster.ingress.nginx.content' },

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

@@ -120,6 +120,11 @@ export default {
     canAzureMigrateOnEdit: {
       type:     Boolean,
       required: true
+    },
+    originalIngressController: {
+      type:     [String, Array],
+      required: false,
+      default:  INGRESS_NONE
     }
   },
 
@@ -699,6 +704,7 @@ export default {
       :traefik-chart="traefikChart"
       :user-chart-values="userChartValues"
       :version-info="versionInfo"
+      :original-ingress-controller="originalIngressController"
       @update-values="(name, val) => $emit('update-values', name, val)"
       @error="$emit('error', $event)"
       @yaml-validation-changed="e => $emit('yaml-validation-changed', e)"

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

@@ -24,6 +24,7 @@ interface Props {
   traefikChart: string;
   userChartValues: any;
   versionInfo: any;
+  originalIngressController?: string | string[];
 }
 const {
   mode = _CREATE,
@@ -33,7 +34,8 @@ const {
   nginxSupported,
   traefikSupported,
   userChartValues,
-  versionInfo
+  versionInfo,
+  originalIngressController = INGRESS_NONE
 } = defineProps<Props>();
 
 const emit = defineEmits(['update:value', 'error', 'config-validation-changed', 'yaml-validation-changed', 'update-values']);
@@ -179,7 +181,10 @@ const compatibilityMode = computed({
 
 function selectIngress(id: string) {
   if ( id === INGRESS_DUAL) {
-    emit('update:value', [TRAEFIK, INGRESS_NGINX]);
+    const newValue: string | string[] = !Array.isArray(originalIngressController) ? (originalIngressController === TRAEFIK ? [TRAEFIK, INGRESS_NGINX] : [INGRESS_NGINX, TRAEFIK]) : originalIngressController;
+
+    emit('update:value', newValue);
+
     preconfigureTraefik();
   } else {
     emit('update:value', id);

package/edit/secret/generic.vue

@@ -51,6 +51,7 @@ export default {
     v-model:value="value.data"
     :mode="mode"
     :initial-empty-row="true"
+    :value-can-be-empty="true"
     :handle-base64="true"
     :value-trim="false"
     :add-allowed="true"

package/edit/secret/index.vue

@@ -1,5 +1,6 @@
 <script>
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import { requireAsset } from '@shell/utils/require-asset';
 import {
   SECRET_SCOPE, SECRET_QUERY_PARAMS,
   CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
@@ -211,7 +212,7 @@ export default {
           let bannerImage, bannerAbbrv;
 
           try {
-            bannerImage = require(`~shell/assets/images/providers/${ id }.svg`);
+            bannerImage = requireAsset(`~shell/assets/images/providers/${ id }.svg`);
           } catch (e) {
             bannerImage = null;
             bannerAbbrv = this.initialDisplayFor(id);

package/edit/service.vue

@@ -18,7 +18,6 @@ import { ucFirst } from '@shell/utils/string';
 import CruResource from '@shell/components/CruResource';
 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, HCI } from '@shell/config/types';
 import { matching } from '@shell/utils/selector-typed';
@@ -58,7 +57,6 @@ export default {
     Tab,
     Tabbed,
     UnitInput,
-    HarvesterServiceAddOnConfig,
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -350,8 +348,10 @@ export default {
 
     <Tabbed
       :side-tabs="true"
+      :resource="value"
       :use-hash="useTabbedHash"
       :default-tab="defaultTab"
+      :extension-params="{ showHarvesterAddOnConfig: String(showHarvesterAddOnConfig) }"
     >
       <Tab
         v-if="checkTypeIs('ExternalName')"
@@ -471,18 +471,6 @@ export default {
           </div>
         </div>
       </Tab>
-      <Tab
-        v-if="showHarvesterAddOnConfig"
-        name="add-on-config"
-        :label="t('servicesPage.harvester.title')"
-        :weight="-1"
-      >
-        <HarvesterServiceAddOnConfig
-          :mode="mode"
-          :value="value"
-          :register-before-hook="registerBeforeHook"
-        />
-      </Tab>
       <Tab
         v-if="!checkTypeIs('ExternalName') && !checkTypeIs('Headless')"
         name="session-affinity"

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

@@ -3,6 +3,12 @@ import { mapGetters } from 'vuex';
 import ResourceTable from '@shell/components/ResourceTable';
 import { MANAGEMENT } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
+import { STEVE_CACHE } from '@shell/store/features';
+
+const hideFeatureFlags = [
+  'fleet', // Note - this is the id of the ff we want, not sure what FLEET in store/features is
+  STEVE_CACHE
+];
 
 export default {
   components: { ResourceTable },
@@ -32,7 +38,7 @@ export default {
     ...mapGetters({ t: 'i18n/t' }),
 
     filteredRows() {
-      return this.rows.filter((x) => x.name !== 'fleet');
+      return this.rows.filter((x) => hideFeatureFlags.indexOf(x.metadata.name) === -1);
     },
 
     enableRowActions() {

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

@@ -167,12 +167,6 @@ export default {
 
   },
 
-  methods: {
-    getCustomDetailLink(cluster) {
-      return cluster.isCapiHybrid ? null : cluster.detailLocation;
-    }
-  },
-
   $loadingResources() {
     // results are filtered so we wouldn't get the correct count on indicator...
     return { loadIndeterminate: true };
@@ -226,8 +220,6 @@ export default {
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :data-testid="'cluster-list'"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-      :get-custom-detail-link="getCustomDetailLink"
-      :sub-rows="true"
     >
       <!-- Why are state column and subrow overwritten here? -->
       <!-- for rke1 clusters, where they try to use the mgmt cluster stateObj instead of prov cluster stateObj,  -->
@@ -273,48 +265,6 @@ export default {
           {{ t('cluster.explore') }}
         </button>
       </template>
-      <template #additional-sub-row="{row, fullColspan, tableActions}">
-        <tr
-          class="capi-unsupported"
-          :class="{'has-description': !!row.stateDescription}"
-        >
-          <td
-            v-if="row.isCapiHybrid"
-            class="row-check"
-          />
-          <td
-            v-if="row.isCapiHybrid"
-            :data-testid="`capi-unsupported-warning-${row?.metadata?.name}`"
-            :colspan="fullColspan - (tableActions ? 1: 0)"
-          >
-            <div
-              class="text-warning"
-              :class="{'mt-5': !!row.stateDescription.trim()}"
-            >
-              <i class="icon icon-warning" />{{ t('cluster.capi.notSupported') }}
-            </div>
-          </td>
-        </tr>
-      </template>
     </ResourceTable>
   </div>
 </template>
-
-<style scoped lang="scss">
-  .capi-unsupported {
-    &.has-description {
-      border-bottom: none;
-      padding: 0px;
-      td {
-        padding-top: 0px;
-      }
-    }
-
-    & div {
-      & i {
-        margin-right: 0.1em;
-      }
-      display: flex;
-    }
-  }
-</style>

package/list/workload.vue

@@ -99,13 +99,21 @@ export default {
     const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
     const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
 
+    const workloadIncludeAssociatedData = paginationEnabled && [
+      WORKLOAD_TYPES.DEPLOYMENT,
+      WORKLOAD_TYPES.DAEMON_SET,
+      WORKLOAD_TYPES.STATEFUL_SET,
+      WORKLOAD_TYPES.JOB,
+    ].includes(type);
+
     return {
       allTypes,
       schema,
       paginationEnabled,
       resources: [],
       loadResources,
-      loadIndeterminate
+      loadIndeterminate,
+      workloadIncludeAssociatedData
     };
   },
 
@@ -143,10 +151,8 @@ export default {
      * Fetch resources required to populate POD_RESTARTS and WORKLOAD_HEALTH_SCALE columns
      */
     loadHeathResources() {
-      // See https://github.com/rancher/dashboard/issues/10417, health comes from selectors applied locally to all pods (bad)
       if (this.paginationEnabled) {
-        // Unfortunately with SSP enabled we cannot fetch all pods to then let each row find applicable pods by locally applied selectors (bad for scaling)
-        // See https://github.com/rancher/dashboard/issues/14211
+        // When SSP is enabled we efficiently fetch stats for health column imbedded in the original resource type by supplying `includeAssociatedData` param
         return;
       }
 
@@ -184,6 +190,7 @@ export default {
       v-if="paginationEnabled"
       :schema="schema"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :includeAssociatedData="workloadIncludeAssociatedData"
     />
     <ResourceTable
       v-else

package/mixins/brand.js

@@ -3,6 +3,7 @@ import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { createCssVars } from '@shell/utils/color';
 import { setTitle } from '@shell/config/private-label';
+import { requireJson } from '@shell/utils/require-asset';
 import { setFavIcon, haveSetFavIcon } from '@shell/utils/favicon';
 import { allHash } from '@shell/utils/promise';
 import { fetchInitialSettings } from '@shell/utils/settings';
@@ -187,7 +188,7 @@ export default {
 
       if ( this.brand ) {
         try {
-          const brandMeta = require(`~shell/assets/brand/${ this.brand }/metadata.json`);
+          const brandMeta = requireJson(`~shell/assets/brand/${ this.brand }/metadata.json`);
 
           if (brandMeta?.hasStylesheet === 'true') {
             bodyClass = `${ cssClass } ${ this.brand } theme-${ this.theme }`;

package/mixins/resource-fetch.js

@@ -87,6 +87,14 @@ export default {
       type:    Function,
       default: null,
     },
+
+    /**
+     * When making a supporting HTTP request include associated resource data
+     */
+    includeAssociatedData: {
+      type:    Boolean,
+      default: false,
+    },
   },
 
   computed: {
@@ -185,9 +193,10 @@ export default {
           return;
         }
         const opt = {
-          hasManualRefresh: this.hasManualRefresh,
-          pagination:       { ...this.pagination },
-          force:            this.paginating !== null // Fix for manual refresh (before ripped out).
+          hasManualRefresh:      this.hasManualRefresh,
+          pagination:            { ...this.pagination },
+          force:                 this.paginating !== null, // Fix for manual refresh (before ripped out).
+          includeAssociatedData: this.includeAssociatedData,
         };
 
         if (this.apiFilter) {

package/models/catalog.cattle.io.clusterrepo.js

@@ -3,6 +3,7 @@ import { CATALOG } from '@shell/config/labels-annotations';
 import { insertAt } from '@shell/utils/array';
 import { CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME, CATALOG as CATALOG_TYPE } from '@shell/config/types';
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
+import { _CREATE } from '@shell/config/query-params';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
 
@@ -173,6 +174,14 @@ export default class ClusterRepo extends SteveModel {
     return this.$rootGetters['i18n/withFallback'](key, null, name);
   }
 
+  detailPageHeaderActionOverride(realMode) {
+    if (realMode === _CREATE) {
+      return this.t('catalog.repo.add');
+    }
+
+    return null;
+  }
+
   get urlDisplay() {
     return this.status?.url || this.spec.gitRepo || this.spec.url;
   }

package/models/cluster.x-k8s.io.machinedeployment.js

@@ -111,12 +111,17 @@ export default class CapiMachineDeployment extends SteveModel {
     return `${ this.spec?.template?.metadata?.labels?.[MACHINE_ROLES.ETCD] }` === 'true';
   }
 
-  // use this pool's definition in the cluster's rkeConfig to scale, not this.spec.replicas
+  // use this pool's definition in the provisioning cluster spec to scale, not this.spec.replicas
   get inClusterSpec() {
-    const machineConfigName = this.template?.metadata?.annotations['rke.cattle.io/cloned-from-name'];
+    // infra from Rancher node driver: provisioning cluster has reference to Rancher-generated crd <provider name>Config from the rke-machine-config.cattle.io api group
+    const rkeMachineConfigName = this.template?.metadata?.annotations['rke.cattle.io/cloned-from-name'];
+    // infra from upstream CAPI provider: provisioning cluster has reference to an upstream provider-specific machine template crd in the infrastructure.cluster.x-k8s.io api group
+    const infrastructureRefName = this.spec?.template?.spec?.infrastructureRef?.name;
+    const machineTemplateName = rkeMachineConfigName || infrastructureRefName;
+
     const machinePools = this.cluster.spec.rkeConfig.machinePools;
 
-    return machinePools.find((pool) => pool.machineConfigRef.name === machineConfigName);
+    return machinePools.find((pool) => pool.machineConfigRef.name === machineTemplateName);
   }
 
   scalePool(delta, save = true, depth = 0) {

package/models/management.cattle.io.authconfig.js

@@ -1,5 +1,6 @@
 import { insertAt } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { requireAsset } from '@shell/utils/require-asset';
 
 export const configType = {
   activedirectory: 'ldap',
@@ -56,7 +57,7 @@ export default class AuthConfig extends SteveModel {
 
   get icon() {
     try {
-      return require(`~shell/assets/images/vendor/${ imageOverrides[this.id] || this.id }.svg`);
+      return requireAsset(`~shell/assets/images/vendor/${ imageOverrides[this.id] || this.id }.svg`);
     } catch (e) {
       return '';
     }

package/models/management.cattle.io.cluster.js

@@ -13,6 +13,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+import { requireAsset } from '@shell/utils/require-asset';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
 import { copyTextToClipboard } from '@shell/utils/clipboard';
 import { isHostedProvider } from '@shell/utils/provider';
@@ -221,7 +222,7 @@ export default class MgmtCluster extends SteveModel {
   }
 
   get providerOsLogo() {
-    return require(`~shell/assets/images/vendor/${ this.providerOs }.svg`);
+    return requireAsset(`~shell/assets/images/vendor/${ this.providerOs }.svg`);
   }
 
   get workerOSs() {
@@ -282,11 +283,11 @@ export default class MgmtCluster extends SteveModel {
     let icon;
 
     try {
-      icon = require(`~shell/assets/images/providers/${ prv }.svg`);
+      icon = requireAsset(`~shell/assets/images/providers/${ prv }.svg`);
     } catch (e) {
       console.warn(`Can not find provider logo for provider ${ logo }`); // eslint-disable-line no-console
       // Use fallback generic Kubernetes icon
-      icon = require(`~shell/assets/images/providers/kubernetes.svg`);
+      icon = requireAsset(`~shell/assets/images/providers/kubernetes.svg`);
     }
 
     return icon;