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

Merge pull request #2201 from loganhz/drain 

Fix node alert issue
This commit is contained in:
Westly Wright 2018-08-31 10:12:23 -07:00 committed by GitHub
parent a16cc10e3f 74673c11c3
commit d2693987b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/components/cluster-dashboard/component.js
View File

@ -1,3 +1,4 @@
import C from 'ui/utils/constants';
import Component from '@ember/component'; import Component from '@ember/component';
import { set, get, computed, observer } from '@ember/object'; import { set, get, computed, observer } from '@ember/object';
import { alias } from '@ember/object/computed'; import { alias } from '@ember/object/computed';
@ -28,7 +29,7 @@ export default Component.extend({
}), }),
inactiveNodes: computed('nodes.@each.state', function() { inactiveNodes: computed('nodes.@each.state', function() {
return get(this, 'nodes').filter( (n) => get(n, 'state') !== 'active' && get(n, 'state') !== 'cordoned' ); return get(this, 'nodes').filter( (n) => C.ACTIVEISH_STATES.indexOf(get(n, 'state')) === -1 );
}), }),
unhealthyComponents: computed('componentStatuses.@each.conditions', function() { unhealthyComponents: computed('componentStatuses.@each.conditions', function() {

3
lib/shared/addon/utils/constants.js
View File

@ -564,6 +564,9 @@ C.ACTIVEISH_STATES = [
'unhealthy', 'unhealthy',
'upgrading', 'upgrading',
'upgraded', 'upgraded',
'draining',
'drained',
'cordoned'
]; ];
C.READY_STATES = [ C.READY_STATES = [