From bef538c5860484a15ffa4f6ba1884bd50b338211 Mon Sep 17 00:00:00 2001 From: Fernando Carletti Date: Thu, 26 Mar 2020 12:43:01 -0600 Subject: [PATCH] Support kubernetes.io/role label for node roles (#155) Signed-off-by: fernandocarletti --- dashboard/client/api/endpoints/nodes.api.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dashboard/client/api/endpoints/nodes.api.ts b/dashboard/client/api/endpoints/nodes.api.ts index c7f2905e8d..862fd831ba 100644 --- a/dashboard/client/api/endpoints/nodes.api.ts +++ b/dashboard/client/api/endpoints/nodes.api.ts @@ -109,6 +109,11 @@ export class Node extends KubeObject { const roleLabels = Object.keys(this.metadata.labels).filter(key => key.includes("node-role.kubernetes.io") ).map(key => key.match(/([^/]+$)/)[0]) // all after last slash + + if (this.metadata.labels["kubernetes.io/role"] != undefined) { + roleLabels.push(this.metadata.labels["kubernetes.io/role"]) + } + return roleLabels.join(", ") }