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

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

View File

@@ -13,7 +13,13 @@ export default class Node extends PIXI.Graphics {
}
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() {

View File

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