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

Merge pull request #6642 from richard-cox/fix-local-nodes 

Ensure local cluster kube node's can determine their cluster id
This commit is contained in:
Richard Cox 2022-08-22 10:49:11 +01:00 committed by GitHub
parent 6e60368927 ebea574766
commit aed0a0b73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell/models/cluster/node.js
View File

@ -7,6 +7,7 @@ import { parseSi } from '@shell/utils/units';
import findLast from 'lodash/findLast';
import SteveModel from '@shell/plugins/steve/steve-class';
import { LOCAL } from '@shell/config/query-params';
export default class ClusterNode extends SteveModel {
get _availableActions() {
@ -254,10 +255,20 @@ export default class ClusterNode extends SteveModel {
}));
}
/**
*Find the node's cluster id from it's url
*/
get clusterId() {
const parts = this.links.self.split('/');
return parts[parts.length - 4];
// Local cluster url links omit `/k8s/clusters/<cluster id>`
// `/v1/nodes` vs `k8s/clusters/c-m-274kcrc4/v1/nodes`
// Be safe when determining this, so work back through the url from a known point
if (parts.length > 6 && parts[parts.length - 6] === 'k8s' && parts[parts.length - 5] === 'clusters') {
return parts[parts.length - 4];
}
return LOCAL;
}
get normanNodeId() {