{item.name}
{item.image}
@@ -24,15 +25,15 @@ const ContainersPanel = ({spec}) => (
{item.resources && item.resources.requests && (
<>
-
{item.resources.requests && item.resources.requests.cpu}
-
{item.resources.requests && item.resources.requests.memory}
+
{item.resources.requests.cpu}
+
{item.resources.requests.memory}
)}
{item.resources && item.resources.limits && (
<>
-
{item.resources.limits && item.resources.limits.cpu}
-
{item.resources.limits && item.resources.limits.memory}
+
{item.resources.limits.cpu}
+
{item.resources.limits.memory}
)}
diff --git a/client/src/components/menu.js b/client/src/components/menu.js
index e14ef86..1a07f7e 100644
--- a/client/src/components/menu.js
+++ b/client/src/components/menu.js
@@ -41,8 +41,8 @@ export default class Menu extends Base {
{/* Security */}
-
-
+
+
diff --git a/client/src/components/podsPanel.js b/client/src/components/podsPanel.js
index df5abb0..27bf44c 100644
--- a/client/src/components/podsPanel.js
+++ b/client/src/components/podsPanel.js
@@ -46,7 +46,7 @@ export default class PodsPanel extends Base {
/>
{!skipNodeName &&
{x.spec.nodeName} | }
{x.status.phase} |
-
{x.spec.containers.length} |
+
{(x.spec.containers || []).length} |
{_.sumBy(x.status.containerStatuses, 'restartCount')} |
|
|
diff --git a/client/src/services/api.js b/client/src/services/api.js
index 3d1bdf7..76e7a69 100644
--- a/client/src/services/api.js
+++ b/client/src/services/api.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import {request, stream, streamResult, streamResults} from './apiProxy';
+import {request, stream, streamResult, streamResults, getToken} from './apiProxy';
import log from '../utils/log';
const JSON_HEADERS = {Accept: 'application/json', 'Content-Type': 'application/json'};
@@ -39,7 +39,14 @@ const apis = {
};
function testAuth() {
- return request('/api/v1/namespaces', null, false);
+ const token = getToken();
+ const body = {
+ apiVerstion: 'authentication.k8s.io/v1',
+ kind: 'TokenReview',
+ spec: {token},
+ };
+
+ return post('/apis/authentication.k8s.io/v1/tokenreviews', body, false);
}
async function apply(body) {
@@ -151,16 +158,16 @@ function logs(namespace, name, container, cb) {
}
}
-function post(url, json) {
+function post(url, json, autoLogoutOnAuthError = true) {
const body = JSON.stringify(json);
const opts = {method: 'POST', body, headers: JSON_HEADERS};
- return request(url, opts);
+ return request(url, opts, autoLogoutOnAuthError);
}
-function put(url, json) {
+function put(url, json, autoLogoutOnAuthError = true) {
const body = JSON.stringify(json);
const opts = {method: 'PUT', body, headers: JSON_HEADERS};
- return request(url, opts);
+ return request(url, opts, autoLogoutOnAuthError);
}
function del(url) {
diff --git a/client/src/services/apiProxy.js b/client/src/services/apiProxy.js
index 577e88c..9c90cd8 100644
--- a/client/src/services/apiProxy.js
+++ b/client/src/services/apiProxy.js
@@ -5,7 +5,7 @@ const nonHashedUrl = href.replace(hash, '').replace(search, '');
const BASE_HTTP_URL = host === 'localhost:4653' ? 'http://localhost:4654' : nonHashedUrl;
const BASE_WS_URL = BASE_HTTP_URL.replace('http', 'ws');
-function getToken() {
+export function getToken() {
return localStorage.authToken;
}
diff --git a/client/src/views/ingress.js b/client/src/views/ingress.js
index 2a5be28..f42e241 100644
--- a/client/src/views/ingress.js
+++ b/client/src/views/ingress.js
@@ -65,8 +65,8 @@ export default class Ingress extends Base {
| {rule.host} |
{path.path} |
- {path.backend.serviceName} |
- {path.backend.servicePort} |
+ {path.backend && path.backend.serviceName} |
+ {path.backend && path.backend.servicePort} |
))}
diff --git a/client/src/views/ingresses.js b/client/src/views/ingresses.js
index 647683e..082ce80 100644
--- a/client/src/views/ingresses.js
+++ b/client/src/views/ingresses.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
import React from 'react';
import Base from '../components/base';
import Filter from '../components/filter';
@@ -45,8 +46,8 @@ export default class Ingresses extends Base {
includeNamespace={true}
href={`#/ingress/${x.metadata.namespace}/${x.metadata.name}`}
/>
-
{x.spec.rules.map(y => y.host).join(' • ')} |
-
{x.spec.rules.flatMap(y => y.http.paths).map(y => y.path).join(' • ')} |
+
{_.map(x.spec.rules, y => y.host).join(' • ')} |
+
{_.flatMap(x.spec.rules, y => y.http.paths).map(y => y.path).join(' • ')} |
)) : (
diff --git a/client/src/views/nodes.js b/client/src/views/nodes.js
index 437c710..0874684 100644
--- a/client/src/views/nodes.js
+++ b/client/src/views/nodes.js
@@ -75,7 +75,7 @@ export default class Nodes extends Base {
{objectMap(x.metadata.labels)}
- {x.status.conditions.find(y => y.type === 'Ready').status}
+ {x.status.conditions && (x.status.conditions.find(y => y.type === 'Ready') || {}).status}
|
diff --git a/client/src/views/persistentVolume.js b/client/src/views/persistentVolume.js
index cc8433c..d59c7f1 100644
--- a/client/src/views/persistentVolume.js
+++ b/client/src/views/persistentVolume.js
@@ -49,14 +49,16 @@ export default class PersistentVolume extends Base {
-
- {`${item.spec.claimRef.namespace}/${item.spec.claimRef.name}`}
-
+ {item.spec.claimRef && (
+
+ {`${item.spec.claimRef.namespace}/${item.spec.claimRef.name}`}
+
+ )}
-
-
+
+
-
+
)}
diff --git a/client/src/views/persistentVolumeClaim.js b/client/src/views/persistentVolumeClaim.js
index ce9d0e1..8e9b1a2 100644
--- a/client/src/views/persistentVolumeClaim.js
+++ b/client/src/views/persistentVolumeClaim.js
@@ -54,7 +54,7 @@ export default class PersistentVolumeClaim extends Base {
-
+
)}
diff --git a/client/src/views/persistentVolumeClaims.js b/client/src/views/persistentVolumeClaims.js
index 830ad79..dc3a0eb 100644
--- a/client/src/views/persistentVolumeClaims.js
+++ b/client/src/views/persistentVolumeClaims.js
@@ -52,7 +52,7 @@ export default class PersistentVolumeClaims extends Base {
| {x.spec.storageClassName} |
{x.spec.accessModes.join(' • ')} |
{x.spec.volumeName} |
-
{x.status.capacity.storage} |
+
{x.status.capacity && x.status.capacity.storage} |
)) : (
diff --git a/client/src/views/persistentVolumes.js b/client/src/views/persistentVolumes.js
index c4a225c..85bb047 100644
--- a/client/src/views/persistentVolumes.js
+++ b/client/src/views/persistentVolumes.js
@@ -44,7 +44,7 @@ export default class PersistentVolumes extends Base {
href={`#/persistentvolume/${x.metadata.name}`}
/>
{x.status.phase} |
-
{x.spec.capacity.storage} |
+
{x.spec.capacity && x.spec.capacity.storage} |
)) : (
diff --git a/client/src/views/pod.js b/client/src/views/pod.js
index 5562762..d1f2c6e 100644
--- a/client/src/views/pod.js
+++ b/client/src/views/pod.js
@@ -36,9 +36,7 @@ export default class Pod extends Base {
const {namespace, name} = this.props;
const {item, metrics, events} = this.state || {};
- const errors = item && item.status.conditions
- .filter(x => !!x.message)
- .map(x => x.message);
+ const errors = getErrors(item);
const filteredEvents = filterByOwner(events, item);
@@ -62,7 +60,7 @@ export default class Pod extends Base {
- {errors &&
}
+ {errors && !!errors.length &&
}
@@ -99,7 +97,7 @@ export default class Pod extends Base {
{_.map(item.status.conditions, x => (
- {x.type} • {x.status}
+ {x.type} • {x.status} • {x.message}
))}
@@ -164,3 +162,11 @@ function Ram({item, metrics}) {
/>
);
}
+
+function getErrors(item) {
+ if (!item) return [];
+ if (item.status.message) return [item.status.message];
+ if (item.status.conditions) return item.status.conditions.map(x => x.message).filter(x => !!x);
+
+ return null;
+}
diff --git a/client/src/views/service.js b/client/src/views/service.js
index d7bed62..297f61c 100644
--- a/client/src/views/service.js
+++ b/client/src/views/service.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
import React from 'react';
import api from '../services/api';
import EventsPanel from '../components/eventsPanel';
@@ -65,7 +66,7 @@ export default class Service extends Base {
- {hasResults(ports) ? item.spec.ports.map(x => (
+ {hasResults(ports) ? _.map(item.spec.ports, x => (
| {x.name} |
{x.port} |
diff --git a/client/src/views/serviceAccount.js b/client/src/views/serviceAccount.js
index f25a07e..3a199cc 100644
--- a/client/src/views/serviceAccount.js
+++ b/client/src/views/serviceAccount.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
import React from 'react';
import Base from '../components/base';
import api from '../services/api';
@@ -43,7 +44,7 @@ export default class ServiceAccount extends Base {
- {item.secrets.map(x => (
+ {_.map(item.secrets, x => (
diff --git a/client/src/views/workloads.js b/client/src/views/workloads.js
index cb3d56d..89e3201 100644
--- a/client/src/views/workloads.js
+++ b/client/src/views/workloads.js
@@ -35,8 +35,7 @@ export default class Workloads extends Base {
const {cronJobs, daemonSets, deployments, jobs, statefulSets, filter = '', sortBy, sortDirection} = this.state || {};
const items = [cronJobs, daemonSets, deployments, jobs, statefulSets];
- let filtered = filterControllers(filter, items);
- filtered = _.orderBy(filtered, [sortBy], [sortDirection]);
+ const filtered = filterControllers(filter, items, sortBy, sortDirection);
const controllerCount = filtered && filtered.length;
const pendingControllerCount = getPendingControllerCount(filtered);
@@ -133,14 +132,14 @@ function getExpectedCount({spec, status}) {
return spec.replicas || status.currentNumberScheduled || 0;
}
-function filterControllers(filter, items) {
+function filterControllers(filter, items, sortBy, sortDirection) {
const results = items.flat();
if (results.length && items.some(x => !x)) return null;
return _(results)
.flatten()
- .sortBy('metadata.name')
+ .orderBy([sortBy], [sortDirection])
.filter(x => test(filter, x.metadata.name))
.value();
}
diff --git a/server/index.js b/server/index.js
index b4336bf..9c29136 100644
--- a/server/index.js
+++ b/server/index.js
@@ -47,15 +47,23 @@ function logging(req, res, next) {
}
async function getOidc(req, res) {
- const authEndpoint = await getOidcEndpoint();
- res.json({authEndpoint});
+ try {
+ const authEndpoint = await getOidcEndpoint();
+ res.json({authEndpoint});
+ } catch (err) {
+ next(err);
+ }
}
-async function postOidc(req, res) {
- const body = await toString(req);
- const {code, redirectUri} = JSON.parse(body);
- const token = await oidcAuthenticate(code, redirectUri);
- res.json({token});
+async function postOidc(req, res, next) {
+ try {
+ const body = await toString(req);
+ const {code, redirectUri} = JSON.parse(body);
+ const token = await oidcAuthenticate(code, redirectUri);
+ res.json({token});
+ } catch (err) {
+ next(err);
+ }
}
function onError(err, req, res) {