@rancher/shell 2.0.0 → 2.0.2-rc.1

package/assets/translations/en-us.yaml

@@ -572,7 +572,7 @@ authConfig:
         title: Are you sure? This update is irreversible.
         body: '<p><b>You may need to make some additional changes</b>. Please ensure the Azure AD app has the Directory.Read.All <b>Application</b> permission added to Microsoft Graph.<br> If any endpoints were customized while configuring Azure AD authentication in Rancher, they will not be automatically updated. </p>'
   oidc:
-    oidc: Configure an OIDC account
+    genericoidc: Configure an OIDC account
     keycloakoidc: Configure a Keycloak OIDC account
     rancherUrl: Rancher URL
     clientId: Client ID
@@ -1186,17 +1186,39 @@ cluster:
     banner: "Service Account access with JWT authentication can be configured after cluster creation from <br>
       <code>Cluster Management > Advanced > JWT Authentication</code>"
   addonChart:
-    rancher-vsphere-cpi: vSphere CPI Configuration
-    rancher-vsphere-csi: vSphere CSI Configuration
-    rke2-calico: Calico Configuration
-    rke2-calico-crd: Calico Configuration
-    rke2-canal: Canal Configuration
-    rke2-cilium: Cilium Configuration
-    rke2-coredns: CoreDNS Configuration
-    rke2-ingress-nginx: NGINX Ingress Configuration
-    rke2-kube-proxy: Kube Proxy Configuration
-    rke2-metrics-server: Metrics Server Configuration
-    rke2-multus: Multus Configuration
+    rancher-vsphere-cpi:
+      label: vSphere CPI
+      configuration: vSphere CPI Configuration
+    rancher-vsphere-csi:
+      label: vSphere CSI
+      configuration: vSphere CSI Configuration
+    rke2-calico:
+      label: Calico
+      configuration: Calico Configuration
+    rke2-calico-crd:
+      label:  Calico
+      configuration: Calico Configuration
+    rke2-canal:
+      label: Canal
+      configuration: Canal Configuration
+    rke2-cilium:
+      label: Cilium
+      configuration: Cilium Configuration
+    rke2-coredns:
+      label: CoreDNS
+      configuration: CoreDNS Configuration
+    rke2-ingress-nginx:
+      label: NGINX
+      configuration: NGINX Ingress Configuration
+    rke2-kube-proxy:
+      label: Kube Proxy
+      configuration: Kube Proxy Configuration
+    rke2-metrics-server:
+      label: Metrics Server
+      configuration: Metrics Server Configuration
+    rke2-multus:
+      label: Multus
+      configuration: Multus Configuration
   agentEnvVars:
     label: Agent Environment
     detail: Add additional environment variables to the agent container.  This is most commonly useful for configuring a HTTP proxy.
@@ -1443,10 +1465,6 @@ cluster:
     placeholder: A unique name for the cluster
   directoryConfig:
     title: Data directory configuration
-    checkboxText: Use the same path for System-agent, Provisioning and K8s Distro data directories configuration
-    common: 
-      label: Data directory configuration path
-      tooltip: Data directory configuration for System-agent, Provisioning and K8s Distro
     systemAgent: 
       label: System-agent directory path
       tooltip: Data directory for the system-agent connection info and plans
@@ -1782,7 +1800,9 @@ cluster:
     rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a href="{docsBase}/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences#cluster-api" target="_blank" rel="noopener nofollow">documentation</a>.'
     desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
     haveArgInfo: Configuration information is not available for the selected Kubernetes version.  The options available on this screen will be limited; you may want to use the YAML editor.
-    cloudProviderAddConfig: 'On Kubernetes 1.27 or greater, the Amazon Cloud Provider requires additional configuration. See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
+    cloudProviderAddConfig: 'On Kubernetes 1.27 or greater, the <b>Amazon</b> Cloud Provider requires additional configuration. See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
+    cloudProviderUnsupportedAzure: 'On Kubernetes 1.30 or greater, the <b>Azure</b> Cloud Provider has been removed. See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
+    cloudProviderMigrateAzure: 'On Kubernetes 1.30 or greater, the <b>Azure</b> Cloud Provider has been removed. To upgrade Kubernetes, the cluster should be migrated to External provider first.<br> See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
     machinePoolError: |-
       {count, plural,
         =1 { {pool_name}: The provided value for {fields} was not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
@@ -1920,6 +1940,7 @@ cluster:
     oracleoke: Oracle OKE
     otc: Open Telekom Cloud
     other: Other
+    ovhcloudmks: OVHcloud MKS
     packet: Equinix Metal
     pinganyunecs: Pinganyun ECS
     pnap: phoenixNAP
@@ -2082,7 +2103,7 @@ cluster:
       s3: s3
   tabs:
     ace: Authorized Endpoint
-    addons: Add-On Config
+    addOnAdditionalManifest: Additional Manifest
     advanced: Advanced
     agentEnv: Agent Environment Vars
     basic: Basics
@@ -2225,7 +2246,22 @@ drivers:
     refresh: Refresh Kubernetes Metadata
   deactivate:
     title: Are you sure?
-    warning: You will no longer be able to edit the configuration of clusters using {name} driver. Resources in the provider will not be automatically removed.
+    andOthers: |-
+      {count, plural,
+      =0 {}
+      =1 { and <b>one other </b>}
+      other { and <b>{count} other </b>}
+      }
+    warningDrivers: |-
+      {count, plural,
+      =1 { You will no longer be able to edit the configuration of clusters using {names} driver.}
+      other { You will no longer be able to edit the configuration of clusters using {names} drivers.}
+      }
+    warning: |-
+      {count, plural,
+      =1 { {warningDrivers} Resources in the corresponding provider will not be automatically removed.}
+      other { {warningDrivers} Resources in the corresponding providers will not be automatically removed.}
+      }
 
 detailText:
   collapse: Hide
@@ -4235,8 +4271,10 @@ inactivity:
 
 # Rancher Extensions
 plugins:
-  incompatibleRancherVersion: "The latest version of this extension ({ version }) is not compatible with the current Rancher version ({ rancherVersion })."
-  incompatibleKubeVersion: "The latest version of this extension ({ version }) is not compatible with the current Kube version ({ kubeVersion })."
+  incompatibleRancherVersion: "The latest version of this extension ({ version }) is not compatible with the current Rancher version ({ required })."
+  incompatibleKubeVersion: "The latest version of this extension ({ version }) is not compatible with the current Kube version ({ required })."
+  incompatibleUiExtensionsApiVersion: "The latest version of this extension ({ version }) is not compatible with the current Extensions API version ({ required })."
+  incompatibleHost: 'The latest version of this extension ({ version }) has a host of "{ required }" which is not compatible with this application "{ mainHost }".'
   currentInstalledVersionBlockedByKubeVersion: "This version is not compatible with the current Kubernetes version ({ kubeVersion }  Vs  { kubeVersionToCheck })."
   labels:
     builtin: Built-in
@@ -4274,8 +4312,10 @@ plugins:
     detail: Detail
     versions: Versions
     versionError: Could not load version information
-    requiresRancherVersion: "Requires Rancher {version}"
-    requiresKubeVersion: "Requires Kube version {version}"
+    requiresRancherVersion: "Requires Rancher {required}"
+    requiresKubeVersion: "Requires Kube version {required}"
+    requiresExtensionApiVersion: "Requires Extensions API version {required}"
+    requiresHost: 'Requires a host that matches "{required}"'
   empty:
     all: Extensions are neither installed nor available
     available: No Extensions available
@@ -6582,7 +6622,7 @@ model:
       okta: Okta
       freeipa: FreeIPA
       googleoauth: Google
-      oidc: Generic OIDC
+      genericoidc: Generic OIDC
       keycloakoidc: Keycloak
 
   cluster:
@@ -7387,7 +7427,7 @@ performance:
       When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable incremental loading
     inputLabel: Resource Threshold
-    incompatibleDescription: "Incremental Loading is incomaptible with Namespace/Project filtering and Server-side Pagination. Enabling this will disable them."
+    incompatibleDescription: "Incremental Loading is incompatible with Namespace/Project filtering and Server-side Pagination. Enabling this will disable them."
   manualRefresh:
     label: Manual Refresh
     setting: You can configure a threshold above which manual refresh will be enabled.
@@ -7396,7 +7436,7 @@ performance:
       When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable manual refresh of data for lists
     inputLabel: Resource Threshold
-    incompatibleDescription: "Manual Refresh is incomaptible with Namespace/Project filtering and Server-side Pagination. Enabling this will disable them."
+    incompatibleDescription: "Manual Refresh is incompatible with Namespace/Project filtering and Server-side Pagination. Enabling this will disable them."
   websocketNotification:
     label: Websocket Notifications
     description: |-
@@ -7427,7 +7467,7 @@ performance:
     label: Require Namespace / Project Filtering
     description: Require the user to select namespaces and/or projects. This restricts the number of resources fetched when viewing lists and should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Required Namespace / Project Filtering
-    incompatibleDescription: "Required Namespace / Project Filtering is incomaptible with Manual Refresh and Incremental Loading. Enabling this will disable them."
+    incompatibleDescription: "Required Namespace / Project Filtering is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
   advancedWorker:
     label: Websocket Web Worker
     description: Updates to resources pushed to the UI come via WebSocket and are handled in the UI thread. Enable this option to handle cluster WebSocket updates in a Web Worker in a separate thread. This should help the responsiveness of the UI in systems where resources change often.
@@ -7444,7 +7484,7 @@ performance:
     description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Server-side Pagination
     applicable: "This applies to the following resource types"
-    incompatibleDescription: "Server-side Pagination is incomaptible with Manual Refresh and Incremental Loading. Enabling this will disable them."
+    incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
     featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
       generic: most resources in the cluster's 'More Resources' section
@@ -7774,4 +7814,4 @@ gitPicker:
 
 networkAttachmentDefinition:
   tabs:
-    config: Config
+    config: Config

package/assets/translations/zh-hans.yaml

@@ -1796,6 +1796,7 @@ cluster:
     oracleoke: Oracle OKE
     otc: Open Telekom Cloud
     other: 其他
+    ovhcloudmks: OVHcloud MKS
     packet: Equinix Metal
     pinganyunecs: 平安云 ECS
     pnap: phoenixNAP

package/components/AlertTable.vue

@@ -49,6 +49,7 @@ export default {
     ];
 
     return {
+      inStore:            this.$store.getters['currentProduct'].inStore,
       alertManagerPoller: new Poller(
         this.loadAlertManagerEvents,
         ALERTMANAGER_POLL_RATE_MS,
@@ -69,15 +70,24 @@ export default {
   },
 
   methods: {
-    async loadAlertManagerEvents() {
-      const inStore = this.$store.getters['currentProduct'].inStore;
-      const alertsEvents = await this.$store.dispatch(
-        `${ inStore }/request`,
-        { url: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/${ this.monitoringNamespace }/services/http:${ this.alertServiceEndpoint }:9093/proxy/api/v1/alerts` }
+    async fetchAlertManagerEvents(version) {
+      return await this.$store.dispatch(
+        `${ this.inStore }/request`,
+        { url: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/${ this.monitoringNamespace }/services/http:${ this.alertServiceEndpoint }:9093/proxy/api/${ version }/alerts` }
       );
+    },
+
+    async loadAlertManagerEvents() {
+      let alertEvents;
+
+      try {
+        alertEvents = await this.fetchAlertManagerEvents('v2');
+      } catch (err) {
+        alertEvents = await this.fetchAlertManagerEvents('v1').then((res) => res?.data);
+      }
 
-      if (alertsEvents.data) {
-        this.allAlerts = alertsEvents.data;
+      if (alertEvents) {
+        this.allAlerts = alertEvents;
       }
     },
 

package/components/AssignTo.vue

@@ -4,6 +4,7 @@ import { FLEET, NORMAN } from '@shell/config/types';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import KeyValue from '@shell/components/form/KeyValue';
 import AsyncButton from '@shell/components/AsyncButton';
+import AppModal from '@shell/components/AppModal.vue';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import { exceptionToErrorsArray } from '@shell/utils/error';
@@ -16,6 +17,7 @@ export default {
     KeyValue,
     AsyncButton,
     Banner,
+    AppModal
   },
 
   data() {

package/components/GrafanaDashboard.vue

@@ -114,10 +114,12 @@ export default {
       this.interval = setInterval(() => {
         try {
           const graphWindow = this.$refs.frame?.contentWindow;
-          const errorElements = graphWindow.document.getElementsByClassName('alert-error');
-          const errorCornerElements = graphWindow.document.getElementsByClassName('panel-info-corner--error');
-          const panelInFullScreenElements = graphWindow.document.getElementsByClassName('panel-in-fullscreen');
-          const panelContainerElements = graphWindow.document.getElementsByClassName('panel-container');
+
+          // Note. getElementsByClassName won't work, following a grafana bump class names are now unique - for example css-2qng6u-panel-container
+          const errorElements = graphWindow.document.querySelectorAll('[class$="alert-error');
+          const errorCornerElements = graphWindow.document.querySelectorAll('[class$="panel-info-corner--error');
+          const panelInFullScreenElements = graphWindow.document.querySelectorAll('[class$="panel-in-fullscreen');
+          const panelContainerElements = graphWindow.document.querySelectorAll('[class$="panel-container');
           const error = errorElements.length > 0 || errorCornerElements.length > 0;
           const loaded = panelInFullScreenElements.length > 0 || panelContainerElements.length > 0;
           const errorMessageElms = graphWindow.document.getElementsByTagName('pre');

package/components/PromptRemove.vue

@@ -376,6 +376,7 @@ export default {
               :value="toRemove"
               :names="names"
               :type="type"
+              :done-location="doneLocation"
               @errors="e => error = e"
               @done="done"
             />

package/components/Questions/index.vue

@@ -45,9 +45,9 @@ export function componentForQuestion(q) {
 
   if ( knownTypes[type] ) {
     return type;
-  } else if ( type.startsWith('array[') ) { // This only really works for array[string|multiline], but close enough for now.
+  } else if ( type.startsWith('array') ) { // This only really works for array[string|multiline], but close enough for now.
     return ArrayType;
-  } else if ( type.startsWith('map[') ) { // Same, only works with map[string|multiline]
+  } else if ( type.startsWith('map') ) { // Same, only works with map[string|multiline]
     return MapType;
   } else if ( type.startsWith('reference[') ) { // Same, only works with map[string|multiline]
     return ReferenceType;

package/components/auth/RoleDetailEdit.vue

@@ -14,7 +14,7 @@ import Tabbed from '@shell/components/Tabbed';
 import { ucFirst } from '@shell/utils/string';
 import SortableTable from '@shell/components/SortableTable';
 import { _CLONE, _DETAIL } from '@shell/config/query-params';
-import { SCOPED_RESOURCES } from '@shell/config/roles';
+import { SCOPED_RESOURCES, SCOPED_RESOURCE_GROUPS } from '@shell/config/roles';
 import { Banner } from '@components/Banner';
 
 import { SUBTYPE_MAPPING, VERBS } from '@shell/models/management.cattle.io.roletemplate';
@@ -195,16 +195,17 @@ export default {
       const scopes = Object.keys(this.scopedResources);
 
       scopes.forEach((scope) => {
-        if (scope === 'globalScopedApiGroups' && this.value.type !== MANAGEMENT.GLOBAL_ROLE) {
+        if (scope === SCOPED_RESOURCE_GROUPS.GLOBAL && this.value.type !== MANAGEMENT.GLOBAL_ROLE) {
           // If we are not in the global role creation form,
           // skip adding the global-scoped resources.
           return;
         }
-        if (scope === 'clusterScopedApiGroups' && (this.value.type === RBAC.ROLE || this.value.subtype === NAMESPACE)) {
+        if (scope === SCOPED_RESOURCE_GROUPS.CLUSTER && (this.value.type === RBAC.ROLE || this.value.subtype === NAMESPACE)) {
           // If we are in a project/namespace role creation form,
           // additionally skip adding the cluster-scoped resources.
           return;
         }
+
         const apiGroupsInScope = this.scopedResources[scope];
 
         const apiGroupNames = Object.keys(apiGroupsInScope);
@@ -237,7 +238,7 @@ export default {
             const labelForNamespaceScoped = this.t('rbac.roletemplate.tabs.grantResources.neuvector.labelNamespaceScoped');
 
             apiGroupLabel = scope.includes('cluster') ? labelForClusterScoped : labelForNamespaceScoped;
-            apiGroupValue = 'api.neuvector.com';
+            apiGroupValue = 'permission.neuvector.com';
           }
 
           options.push({

package/components/form/KeyValue.vue

@@ -758,6 +758,7 @@ export default {
             :name="'col:' + c"
             :row="row"
             :queue-update="queueUpdate"
+            :i="i"
           />
         </div>
         <div

package/components/form/Members/ClusterPermissionsEditor.vue

@@ -177,7 +177,7 @@ export default {
     },
     customPermissionsUpdate() {
       return this.customPermissions.reduce((acc, customPermissionsItem) => {
-        const lockedExist = this.roleTemplates.find((roleTemplateItem) => roleTemplateItem.displayName === customPermissionsItem.label);
+        const lockedExist = this.roleTemplates.find((roleTemplateItem) => roleTemplateItem.id === customPermissionsItem.key);
 
         if (lockedExist.locked) {
           customPermissionsItem['locked'] = true;

package/components/form/ProjectMemberEditor.vue

@@ -192,7 +192,7 @@ export default {
     },
     customPermissionsUpdate() {
       return this.customPermissions.reduce((acc, customPermissionsItem) => {
-        const lockedExist = this.roleTemplates.find((roleTemplateItem) => roleTemplateItem.displayName === customPermissionsItem.label);
+        const lockedExist = this.roleTemplates.find((roleTemplateItem) => roleTemplateItem.id === customPermissionsItem.key);
 
         if (lockedExist.locked) {
           customPermissionsItem['locked'] = true;

package/components/form/ResourceLabeledSelect.vue

@@ -126,11 +126,17 @@ export default defineComponent({
 
   computed: {
     labelSelectAttributes() {
+      // This component is a wrapper for LabelSelect, so pass through everything
+      const allAttrs = {
+        ...this.$attrs, // Attributes (other than props)
+        ...this.$props, // Attributes that are props
+      };
+
       return this.paginate ? {
-        ...this.$attrs,
+        ...allAttrs,
         ...this.paginatedResourceSettings?.labelSelectOptions || {}
       } : {
-        ...this.$attrs,
+        ...allAttrs,
         ...this.allResourcesSettings?.labelSelectOptions || {}
       };
     },
@@ -156,7 +162,9 @@ export default defineComponent({
       }
 
       const { filter } = opts;
-      const filters = !!filter ? [PaginationParamFilter.createSingleField({ field: 'metadata.name', value: filter })] : [];
+      const filters = !!filter ? [PaginationParamFilter.createSingleField({
+        field: 'metadata.name', value: filter, exact: false
+      })] : [];
       const defaultOptions: LabelSelectPaginationFunctionOptions = {
         opts,
         filters,

package/components/form/Taints.vue

@@ -3,10 +3,10 @@ import KeyValue from '@shell/components/form/KeyValue';
 import { _VIEW } from '@shell/config/query-params';
 import Select from '@shell/components/form/Select';
 
-const EFFECT_VALUES = {
-  NO_SCHEDULE:        'NoSchedule',
-  PREFER_NO_SCHEDULE: 'PreferNoSchedule',
-  NO_EXECUTE:         'NoExecute',
+const DEFAULT_EFFECT_VALUES = {
+  NoSchedule:       'NoSchedule',
+  PreferNoSchedule: 'PreferNoSchedule',
+  NoExecute:        'NoExecute',
 };
 
 export default {
@@ -24,11 +24,15 @@ export default {
     disabled: {
       default: false,
       type:    Boolean
+    },
+    effectValues: {
+      type:    Object,
+      default: () => DEFAULT_EFFECT_VALUES
     }
   },
 
   data() {
-    return { effectOptions: Object.values(EFFECT_VALUES).map((v) => ({ label: v, value: v })) };
+    return { effectOptions: Object.keys(this.effectValues).map((k) => ({ label: this.effectValues[k], value: k })) };
   },
 
   computed: {
@@ -43,7 +47,7 @@ export default {
     },
 
     defaultAddData() {
-      return { effect: EFFECT_VALUES.NO_SCHEDULE };
+      return { effect: this.effectOptions[0].value };
     }
   }
 };
@@ -53,6 +57,7 @@ export default {
   <div class="taints">
     <KeyValue
       v-model="localValue"
+      data-testid="taints-keyvalue"
       :title="t('tableHeaders.taints')"
       :mode="mode"
       :as-map="false"
@@ -69,9 +74,10 @@ export default {
         {{ t('tableHeaders.effect') }}
       </template>
 
-      <template #col:effect="{row, queueUpdate}">
+      <template #col:effect="{row, queueUpdate, i}">
         <Select
           v-model="row.effect"
+          :data-testid="`taints-effect-row-${i}`"
           :options="effectOptions"
           :disabled="disabled"
           class="compact-select"

package/components/form/__tests__/Taints.test.ts

@@ -0,0 +1,70 @@
+import { mount } from '@vue/test-utils';
+import Taints from '@shell/components/form/Taints.vue';
+
+describe('component: Taints', () => {
+  it('should accept custom effect values', async() => {
+    const customEffects = { FOO_EFFECT: 'foo', BAR_EFFECT: 'bar' };
+
+    const wrapper = mount(Taints, {
+      propsData: {
+        value:        [{ effect: 'FOO_EFFECT', value: 'abc' }],
+        effectValues: customEffects
+      }
+    });
+
+    const firstEffectInput = wrapper.find('[data-testid="taints-effect-row-0"]');
+
+    expect(firstEffectInput.exists()).toBe(true);
+
+    expect(firstEffectInput.props().value).toBe('FOO_EFFECT');
+    expect(firstEffectInput.props().options).toStrictEqual([{ value: 'FOO_EFFECT', label: 'foo' }, { value: 'BAR_EFFECT', label: 'bar' }]);
+
+    const taintKV = wrapper.find('[data-testid="taints-keyvalue"]');
+
+    taintKV.vm.add();
+    await wrapper.vm.$nextTick();
+
+    const secondEffectInput = wrapper.find('[data-testid="taints-effect-row-1"]');
+
+    expect(secondEffectInput.exists()).toBe(true);
+
+    expect(secondEffectInput.props().value).toStrictEqual('FOO_EFFECT');
+    expect(wrapper.vm.defaultAddData).toStrictEqual({ effect: 'FOO_EFFECT' });
+  });
+
+  it('should use default effect values of NoSchedule, PreferNoSchedule, and PreferNoExecute', async() => {
+    const expectedEffectOptions = [
+      { label: 'NoSchedule', value: 'NoSchedule' },
+      { label: 'PreferNoSchedule', value: 'PreferNoSchedule' },
+
+      { label: 'NoExecute', value: 'NoExecute' },
+
+    ];
+
+    const wrapper = mount(Taints, { propsData: { value: [{ effect: '', value: 'abc' }] } });
+
+    const firstEffectInput = wrapper.find('[data-testid="taints-effect-row-0"]');
+
+    expect(firstEffectInput.exists()).toBe(true);
+
+    expect(firstEffectInput.props().value).toBe('');
+    expect(firstEffectInput.props().options).toStrictEqual(expectedEffectOptions);
+  });
+
+  it('should set the effect value to NoSchedule by default', async() => {
+    const wrapper = mount(Taints, { propsData: { value: [] } });
+
+    const taintKV = wrapper.find('[data-testid="taints-keyvalue"]');
+
+    taintKV.vm.add();
+    await wrapper.vm.$nextTick();
+
+    const effectInput = wrapper.find('[data-testid="taints-effect-row-0"]');
+
+    expect(effectInput.exists()).toBe(true);
+
+    expect(effectInput.props().value).toStrictEqual('NoSchedule');
+
+    expect(wrapper.vm.defaultAddData).toStrictEqual({ effect: 'NoSchedule' });
+  });
+});

package/components/form/labeled-select-utils/labeled-select.utils.ts

@@ -109,7 +109,7 @@ export async function labelSelectPaginationFunction<T>({
 
     return {
       page:  resPage,
-      pages: res.pages,
+      pages: res.pages || Math.ceil(res.count / (pageSize || Number.MAX_SAFE_INTEGER)),
       total: res.count
     };
   } catch (err) {

package/components/nav/Header.vue

@@ -133,7 +133,7 @@ export default {
       // Don't show if the header is in 'simple' mode
       const notSimple = !this.simple;
       // One of these must be enabled, otherwise t here's no component to show
-      const validFilterSettings = this.currentProduct.showNamespaceFilter || this.currentProduct.showWorkspaceSwitcher;
+      const validFilterSettings = this.currentProduct?.showNamespaceFilter || this.currentProduct?.showWorkspaceSwitcher;
 
       return validClusterOrProduct && notSimple && validFilterSettings;
     },

package/components/nav/TopLevelMenu.vue

@@ -1090,7 +1090,7 @@ export default {
           }
         }
 
-        > i {
+        > i, > img {
           display: block;
           width: 42px;
           font-size: $icon-size;
@@ -1102,9 +1102,6 @@ export default {
           margin-right: 16px;
           fill: var(--link);
         }
-        img {
-          margin-right: 16px;
-        }
 
         &.router-link-active, &.active-menu-link {
           background: var(--primary-hover-bg);

package/config/pagination-table-headers.js

@@ -17,15 +17,16 @@ export const STEVE_ID_COL = {
   name:     'steve-id',
   labelKey: 'tableHeaders.id',
   value:    'id',
-  sort:     ['id'],
-  search:   'id',
+  sort:     false, // sort:     ['id'], // Pending API support
+  search:   false, // search:   'id', // Pending API support
 };
 
 export const STEVE_STATE_COL = {
   ...STATE,
-  // value:  'metadata.state.name', Use the state as defined by the resource rather than converted via the model.
+  // Note, we're show the 'state' as per model, not the 'metadata.state.name' that's available in the model to remotely sort/filter
+  // Need to investigate whether we should 'dumb down' the state we show to the native one (tracked via https://github.com/rancher/dashboard/issues/8527)
   // This means we'll show something different to what we sort and filter on.
-  sort:   [], // ['metadata.state.name'], // Pending API support
+  sort:   false, // ['metadata.state.name'], // Pending API support
   search: false, // 'metadata.state.name', // Pending API support
 };
 

package/config/product/auth.js

@@ -174,7 +174,7 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/googleoauth`, 'auth/googleoauth');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/azuread`, 'auth/azuread');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
-  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/oidc`, 'auth/oidc');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
 
   basicType([
     'config',