Revert "make protobuff the default method and move it as an env var in backend"

This reverts commit 36ace74575.

client/src/app.tsx

@@ -4,11 +4,9 @@ import {Notifier} from './components/notifier';
 import Error from './components/error';
 import {initRouter} from './router';
 import log from './utils/log';
-import {setContext, Context} from './utils/localStorageHelpers';
 import Button from './components/button';
 import LogoSvg from './art/skoonerSvg';
 import HamburgerSvg from './art/hamburgerSvg';
-import api from './services/api';
 
 type State = {
     content?: ReactNode;
@@ -29,7 +27,6 @@ class App extends Component<{}, State> {
             this.setState({content, contentDate: Date.now(), hasError: false});
             window.scrollTo(0, 0);
         });
-        this.setContext();
     }
 
     componentDidCatch(err: Error, info: any) { // eslint-disable-line class-methods-use-this
@@ -37,12 +34,6 @@ class App extends Component<{}, State> {
         this.setState({hasError: true});
     }
 
-    setContext() {
-        api.context().then((context: Context) => {
-            setContext(context);
-        });
-    }
-
     render() {
         const {content, contentDate, hasError, menuToggled} = this.state || {};
 

client/src/services/api.ts

@@ -46,7 +46,6 @@ const apis = {
     exec,
     metrics: metricsFactory(),
     oidc: oidcFactory(),
-    context,
 
     clusterRole,
     namespace: namespaceService,
@@ -188,8 +187,4 @@ function logs(namespace: string, name: string, container: string, tailLines: num
     }
 }
 
-function context() {
-    return request('/context');
-}
-
 export default apis;

client/src/utils/localStorageHelpers.ts

@@ -1,26 +0,0 @@
-const CONTEXT = 'context';
-
-export type Context = {
-    protoEnabled?: boolean;
-    promethusEnabled?: boolean;
-}
-
-export function getContextItem(item: string) {
-    return getItem(CONTEXT)[item];
-}
-
-export function setContext(context: Context) {
-    setItem(CONTEXT, {
-        protoEnabled: true,
-        promethusEnabled: false,
-        ...context,
-    });
-}
-
-export function setItem(item: string, object: Object) {
-    localStorage.setItem(item, JSON.stringify(object));
-}
-
-export function getItem(item: string) {
-    return JSON.parse(localStorage.getItem(item) || '');
-}

client/src/utils/protoHelpers.ts

@@ -1,5 +1,4 @@
 import {k8s} from '../proto/proto';
-import {getContextItem} from './localStorageHelpers';
 
 const {Unknown} = k8s.io.apimachinery.pkg.runtime;
 const {NodeMetrics} = k8s.io.metrics.pkg.apis.metrics.v1beta1;
@@ -19,36 +18,36 @@ export const kindMap: {
                 | typeof EventList
                 | typeof NodeList
                 | typeof PodList,
-            paths: string[]
+            path: string
         }
     } = {
         NodeMetrics: {
             proto: NodeMetrics,
-            paths: ['/apis/metrics.k8s.io/v1beta1/node'],
+            path: '/apis/metrics.k8s.io/v1beta1/node',
         },
         NodeMetricsList: {
             proto: NodeMetricsList,
-            paths: ['/apis/metrics.k8s.io/v1beta1/nodes'],
+            path: '/apis/metrics.k8s.io/v1beta1/nodes',
         },
         PodMetrics: {
             proto: PodMetrics,
-            paths: ['/apis/metrics.k8s.io/v1beta1/pod'],
+            path: '/apis/metrics.k8s.io/v1beta1/pod',
         },
         PodMetricsList: {
             proto: PodMetricsList,
-            paths: ['/apis/metrics.k8s.io/v1beta1/pods'],
+            path: '/apis/metrics.k8s.io/v1beta1/pods',
         },
         EventList: {
             proto: EventList,
-            paths: ['api/v1/events'],
+            path: 'api/v1/events',
         },
         NodeList: {
             proto: NodeList,
-            paths: ['api/v1/nodes'],
+            path: 'api/v1/nodes',
         },
         PodList: {
             proto: PodList,
-            paths: ['api/v1/pods', 'v1beta1/namespaces/kube-system/pods', 'v1/namespaces/kube-system/pods'],
+            path: 'api/v1/pods',
         },
     };
 
@@ -69,14 +68,22 @@ export function protoParser(raw: Uint8Array) {
 }
 
 export function isProtoEnabled(): boolean {
-    return getContextItem('protoEnabled');
+    return window.localStorage.getItem('protoEnabled') === 'true';
 }
 
 export function isProtoEligible(url: string) {
     for (const value of Object.values(kindMap)) {
-        if (value.paths.some(path => url.includes(path))) {
+        if (url.includes(value.path)) {
             return true;
         }
     }
     return false;
 }
+
+export function enableProto(): void {
+    window.localStorage.setItem('protoEnabled', 'true');
+}
+
+export function disableProto(): void {
+    window.localStorage.setItem('protoEnabled', 'false');
+}

server/index.js

@@ -14,7 +14,6 @@ const OIDC_SECRET = process.env.OIDC_SECRET;
 const OIDC_URL = process.env.OIDC_URL;
 const OIDC_SCOPES = process.env.OIDC_SCOPES || 'openid email';
 const OIDC_METADATA = JSON.parse(process.env.OIDC_METADATA || '{}');
-const USE_PROTO = process.env.USE_PROTO !== 'false' || true;
 const clientMetadata = Object.assign({client_id: OIDC_CLIENT_ID, client_secret: OIDC_SECRET}, OIDC_METADATA);
 
 console.log('OIDC_URL: ', OIDC_URL || 'None');
@@ -51,7 +50,6 @@ if (NODE_ENV !== 'production') app.use(cors());
 app.use('/', preAuth, express.static('public'));
 app.get('/oidc', getOidc);
 app.post('/oidc', postOidc);
-app.get('/context', getContext);
 app.use('/*', createProxyMiddleware(proxySettings));
 app.use(handleErrors);
 
@@ -59,12 +57,6 @@ const port = process.env.SERVER_PORT || 4654;
 http.createServer(app).listen(port);
 console.log(`Server started. Listening on port ${port}`);
 
-function getContext(req, res) {
-    res.json({
-        "protoEnabled": USE_PROTO,
-    })
-}
-
 function preAuth(req, res, next) {
     const auth = req.header('Authorization');