rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13208 from richard-cox/fix-monitoring-install 

Fix failure to fetch workload resources in monitoring chart install
This commit is contained in:
Richard Cox 2025-06-04 17:57:23 +01:00 committed by GitHub
parent 93aaeb7381 dbd6d934c2
commit a985e97469
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/chart/monitoring/index.vue
View File

@ -55,7 +55,7 @@ export default {
async fetch() { async fetch() {
const { $store } = this; const { $store } = this;
// Fetch all the resources required for all the tabs asyncronously up front // Fetch all the resources required for all the tabs asynchronously up front
const hashPromises = { const hashPromises = {
namespaces: $store.getters['namespaces'](), namespaces: $store.getters['namespaces'](),
pvcs: $store.dispatch('cluster/findAll', { type: PVC }), pvcs: $store.dispatch('cluster/findAll', { type: PVC }),

2
shell/components/form/ResourceTabs/index.vue
View File

@ -195,7 +195,7 @@ export default {
pagination.filters = []; pagination.filters = [];
} }
const field = `involvedObject.uid`; // Pending API Support - https://github.com/rancher/rancher/issues/48603 const field = `involvedObject.uid`;
// of type PaginationParamFilter // of type PaginationParamFilter
let existing = null; let existing = null;

29
shell/config/product/explorer.js
View File

@ -32,7 +32,7 @@ import {
import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map'; import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
import { STEVE_CACHE } from '@shell/store/features'; import { STEVE_CACHE } from '@shell/store/features';
import { configureConditionalDepaginate } from '@shell/store/type-map.utils'; import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations'; import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
export const NAME = 'explorer'; export const NAME = 'explorer';
@ -283,7 +283,7 @@ export function init(store) {
STEVE_NAMESPACE_COL, STEVE_NAMESPACE_COL,
{ {
...INGRESS_TARGET, ...INGRESS_TARGET,
sort: 'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields) sort: 'spec.rules[0].host', // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
search: false, // This is broken in normal world, so disable here search: false, // This is broken in normal world, so disable here
}, },
{ {
@ -294,7 +294,7 @@ export function init(store) {
{ {
...INGRESS_CLASS, ...INGRESS_CLASS,
sort: 'spec.ingressClassName', sort: 'spec.ingressClassName',
search: 'spec.ingressClassName', // Pending API support (blocked https://github.com/rancher/rancher/issues/48473 (index fields) search: 'spec.ingressClassName',
}, },
STEVE_AGE_COL STEVE_AGE_COL
] ]
@ -305,8 +305,11 @@ export function init(store) {
[ [
STEVE_STATE_COL, STEVE_STATE_COL,
STEVE_NAME_COL, STEVE_NAME_COL,
STEVE_NAMESPACE_COL, STEVE_NAMESPACE_COL, {
TARGET_PORT, ...TARGET_PORT,
sort: false,
search: false,
},
{ {
// Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken ) // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
...SELECTOR, ...SELECTOR,
@ -315,8 +318,8 @@ export function init(store) {
}, },
{ {
...SPEC_TYPE, ...SPEC_TYPE,
sort: false, // ['spec.type', 'spec.clusterIP'] Pending API support (blocked https://github.com/rancher/rancher/issues/48473 (index fields) sort: ['spec.type'],
search: 'spec.type', search: 'spec.type'
}, },
STEVE_AGE_COL STEVE_AGE_COL
] ]
@ -345,10 +348,10 @@ export function init(store) {
STEVE_STATE_COL, STEVE_STATE_COL,
STEVE_NAME_COL, STEVE_NAME_COL,
STEVE_NAMESPACE_COL, STEVE_NAMESPACE_COL,
HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering) HPA_REFERENCE, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering) MIN_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering) MAX_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering) CURRENT_REPLICA, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
STEVE_AGE_COL STEVE_AGE_COL
] ]
); );
@ -496,8 +499,8 @@ export function init(store) {
}, },
{ {
...STORAGE_CLASS_DEFAULT, ...STORAGE_CLASS_DEFAULT,
sort: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453 sort: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
search: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453 search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
}, },
STEVE_AGE_COL STEVE_AGE_COL
] ]

5
shell/models/service.js
View File

@ -138,6 +138,11 @@ export default class Service extends SteveModel {
} }
async fetchPods() { async fetchPods() {
if (!this.podRelationship) {
// If empty or not present, the service is assumed to have an external process managing its endpoints
return [];
}
return await this.$dispatch('findLabelSelector', { return await this.$dispatch('findLabelSelector', {
type: POD, type: POD,
matching: { matching: {

44
shell/plugins/steve/steve-pagination-utils.ts
View File

@ -15,7 +15,7 @@ import {
HPA, HPA,
SECRET SECRET
} from '@shell/config/types'; } from '@shell/config/types';
import { CAPI as CAPI_LAB_AND_ANO, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations'; import { CAPI as CAPI_LAB_AND_ANO, CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
import { Schema } from '@shell/plugins/steve/schema'; import { Schema } from '@shell/plugins/steve/schema';
import { PaginationSettingsStore } from '@shell/types/resources/settings'; import { PaginationSettingsStore } from '@shell/types/resources/settings';
import paginationUtils from '@shell/utils/pagination-utils'; import paginationUtils from '@shell/utils/pagination-utils';
@ -194,7 +194,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
{ field: '_type' }, { field: '_type' },
{ field: 'reason' }, { field: 'reason' },
{ field: 'involvedObject.kind' }, { field: 'involvedObject.kind' },
// { field: 'involvedObject.uid' }, // Pending API Support - https://github.com/rancher/rancher/issues/48603 { field: 'involvedObject.uid' },
{ field: 'message' }, { field: 'message' },
], ],
[CATALOG.CLUSTER_REPO]: [ [CATALOG.CLUSTER_REPO]: [
@ -215,17 +215,17 @@ class StevePaginationUtils extends NamespaceProjectFilters {
], ],
[SERVICE]: [ [SERVICE]: [
{ field: 'spec.type' }, { field: 'spec.type' },
// { field: 'spec.clusterIP' }, // Pending API support (blocked https://github.com/rancher/rancher/issues/48473 (index fields) { field: 'spec.clusterIP' },
], ],
[INGRESS]: [ [INGRESS]: [
// { field: 'spec.rules.host' }, // Pending API support (blocked https://github.com/rancher/rancher/issues/48473 (index fields) { field: 'spec.rules.host' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
// { field: 'spec.ingressClassName' }, // Pending API support (blocked https://github.com/rancher/rancher/issues/48473 (index fields) { field: 'spec.ingressClassName' },
], ],
[HPA]: [ [HPA]: [
// { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix) { field: 'spec.scaleTargetRef.name' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
// { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix) { field: 'spec.minReplicas' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
// { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix) { field: 'spec.maxReplicas' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
// { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix) { field: 'spec.currentReplicas' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50527
], ],
[PVC]: [ [PVC]: [
{ field: 'spec.volumeName' }, { field: 'spec.volumeName' },
@ -236,27 +236,37 @@ class StevePaginationUtils extends NamespaceProjectFilters {
], ],
[STORAGE_CLASS]: [ [STORAGE_CLASS]: [
{ field: 'provisioner' }, { field: 'provisioner' },
// { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API Support - https://github.com/rancher/rancher/issues/48453 { field: `metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]` },
], ],
[CATALOG.APP]: [ [CATALOG.APP]: [
{ field: 'spec.chart.metadata.name' } { field: 'spec.chart.metadata.name' }
], ],
[WORKLOAD_TYPES.CRON_JOB]: [ [WORKLOAD_TYPES.CRON_JOB]: [
{ field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` } { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` },
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
], ],
[WORKLOAD_TYPES.DAEMON_SET]: [ [WORKLOAD_TYPES.DAEMON_SET]: [
{ field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` } { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` },
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
], ],
[WORKLOAD_TYPES.DEPLOYMENT]: [ [WORKLOAD_TYPES.DEPLOYMENT]: [
{ field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` } { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` },
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
], ],
[WORKLOAD_TYPES.JOB]: [ [WORKLOAD_TYPES.JOB]: [
{ field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` } { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` },
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
], ],
[WORKLOAD_TYPES.STATEFUL_SET]: [ [WORKLOAD_TYPES.STATEFUL_SET]: [
{ field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` } { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` },
] { field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
],
[WORKLOAD_TYPES.REPLICA_SET]: [
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
],
[WORKLOAD_TYPES.REPLICATION_CONTROLLER]: [
{ field: 'spec.template.spec.containers.image' }, // Pending API Support - BUG - https://github.com/rancher/rancher/issues/50526
],
} }
private convertArrayPath(path: string): string { private convertArrayPath(path: string): string {