+
diff --git a/components/formatter/PercentageBar.vue b/components/formatter/PercentageBar.vue
index 7975792de8..1daca76cca 100644
--- a/components/formatter/PercentageBar.vue
+++ b/components/formatter/PercentageBar.vue
@@ -23,7 +23,7 @@ export default {
},
computed: {
percentage() {
- return Number.parseFloat(this.value) / 100;
+ return Number.parseFloat(this.value);
}
}
};
diff --git a/config/product/explorer.js b/config/product/explorer.js
index f160ce000b..9d97c387b2 100644
--- a/config/product/explorer.js
+++ b/config/product/explorer.js
@@ -11,7 +11,7 @@ import {
import {
STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, KEYS,
- INGRESS_DEFAULT_BACKEND, INGRESS_TARGET, ROLES, VERSION, INTERNAL_EXTERNAL_IP, CPU, RAM,
+ INGRESS_DEFAULT_BACKEND, INGRESS_TARGET,
SPEC_TYPE, TARGET_PORT, SELECTOR, NODE as NODE_COL, TYPE, WORKLOAD_IMAGES, POD_IMAGES,
USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
@@ -167,7 +167,6 @@ export function init(store) {
AGE
]);
headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, AGE]);
- headers(NODE, [STATE, NAME_COL, ROLES, VERSION, INTERNAL_EXTERNAL_IP, CPU, RAM, AGE]);
headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
diff --git a/config/table-headers.js b/config/table-headers.js
index 383aa7f36c..38c13c886f 100644
--- a/config/table-headers.js
+++ b/config/table-headers.js
@@ -198,8 +198,10 @@ export const PODS = {
name: 'pods',
labelKey: 'tableHeaders.pods',
sort: 'pods',
- value: 'podUsage',
- formatter: 'PercentageBar'
+ search: false,
+ value: 'podConsumedUsage',
+ formatter: 'PercentageBar',
+ width: 120,
};
export const AGE = {
diff --git a/config/types.js b/config/types.js
index 1eb9818a6a..e6a8a6a1fe 100644
--- a/config/types.js
+++ b/config/types.js
@@ -17,6 +17,8 @@ export const NORMAN = {
CLUSTER_TOKEN: 'clusterregistrationtoken',
CLUSTER_ROLE_TEMPLATE_BINDING: 'clusterRoleTemplateBinding',
GROUP: 'group',
+ // Note - This allows access to node resources, not schema's or custom components (both are accessed via 'type' which clashes with kube node)
+ NODE: 'node',
PRINCIPAL: 'principal',
PROJECT: 'project',
PROJECT_ROLE_TEMPLATE_BINDING: 'projectRoleTemplateBinding',
@@ -137,6 +139,7 @@ export const MANAGEMENT = {
FEATURE: 'management.cattle.io.feature',
GROUP: 'management.cattle.io.group',
KONTANIER_DRIVER: 'management.cattle.io.kontainerdriver',
+ NODE: 'management.cattle.io.node',
NODE_DRIVER: 'management.cattle.io.nodedriver',
NODE_POOL: 'management.cattle.io.nodepool',
NODE_TEMPLATE: 'management.cattle.io.nodetemplate',
diff --git a/edit/node.vue b/edit/node.vue
index da6b507738..fa001db33d 100644
--- a/edit/node.vue
+++ b/edit/node.vue
@@ -44,7 +44,6 @@ export default {
:value="value"
:namespaced="false"
:mode="mode"
- :extra-columns="extraColumns"
/>
diff --git a/list/node.vue b/list/node.vue
index ea0557f8de..f95e5c2083 100644
--- a/list/node.vue
+++ b/list/node.vue
@@ -1,17 +1,27 @@