lnmch/kops-arm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect new node role label to detect master nodes (#149)

Browse Source
This commit is contained in:
Tomasz Pawelczak
2018-01-15 18:20:00 +01:00
parent 3a2459e771
commit e020a802de
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/node.js
View File

@@ -13,7 +13,13 @@ export default class Node extends PIXI.Graphics {
} }
isMaster() { isMaster() {
return this.node.labels.master == 'true' for (var key in this.node.labels) {
if (key == 'node-role.kubernetes.io/master' ||
key == 'kubernetes.io/role' && this.node.labels[key] == 'master' ||
key == 'master' && this.node.labels[key] == 'true' ) {
return true
}
}
} }
getResourceUsage() { getResourceUsage() {

5
kube_ops_view/mock.py
View File

@@ -69,6 +69,11 @@ def query_mock_cluster(cluster):
continue continue
labels = {} labels = {}
if i < 2: if i < 2:
if index == 0:
labels['kubernetes.io/role'] = 'master'
elif index == 1:
labels['node-role.kubernetes.io/master'] = ''
else:
labels['master'] = 'true' labels['master'] = 'true'
pods = {} pods = {}
for j in range(hash_int((index + 1) * (i + 1)) % 32): for j in range(hash_int((index + 1) * (i + 1)) % 32):