Added namespacing support, admin updates, now all are isolated a bit better

Author: commjoen

wrongsecrets-balancer/src/admin/admin.js

@@ -39,7 +39,10 @@ async function listInstances(req, res) {
 
   return res.json({
     instances: instances.map((instance) => {
-      const team = instance.metadata.labels.team;
+      let team = instance.metadata.labels.team;
+      if (team === '') {
+        team = 'kubelet-ignore-this';
+      }
       return {
         team,
         name: instance.metadata.name,

wrongsecrets-balancer/src/kubernetes.js

@@ -7,18 +7,20 @@ const k8sCoreApi = kc.makeApiClient(CoreV1Api);
 
 const { get } = require('./config');
 
-const lodashGet = require('lodash/get');
-const once = require('lodash/once');
+//used for owner ref, not used now:
+// const lodashGet = require('lodash/get');
+// const once = require('lodash/once');
 
+//used for owner ref, not used now:
 // Gets the Deployment uid for the JuiceBalancer
 // This is required to set the JuiceBalancer as owner of the created JuiceShop Instances
-const getJuiceBalancerDeploymentUid = once(async () => {
-  const deployment = await k8sAppsApi.readNamespacedDeployment(
-    'wrongsecrets-balancer',
-    get('namespace')
-  );
-  return lodashGet(deployment, ['body', 'metadata', 'uid'], null);
-});
+// const getJuiceBalancerDeploymentUid = once(async () => {
+//   const deployment = await k8sAppsApi.readNamespacedDeployment(
+//     'wrongsecrets-balancer',
+//     get('namespace')
+//   );
+//   return lodashGet(deployment, ['body', 'metadata', 'uid'], null);
+// });
 
 const createNameSpaceForTeam = async (team) => {
   const namedNameSpace = {
@@ -349,23 +351,24 @@ const createDesktopServiceForTeam = async (teamname) =>
     });
 module.exports.createDesktopServiceForTeam = createDesktopServiceForTeam;
 
-async function getOwnerReference() {
-  if (get('skipOwnerReference') === true) {
-    return {};
-  }
-  return {
-    ownerReferences: [
-      {
-        apiVersion: 'apps/v1',
-        blockOwnerDeletion: true,
-        controller: true,
-        kind: 'Deployment',
-        name: 'wrongsecrets-balancer',
-        uid: await getJuiceBalancerDeploymentUid(),
-      },
-    ],
-  };
-}
+//used for owner ref, not used now as we cannot do clusterwide owning of namespaced items:
+// async function getOwnerReference() {
+//   if (get('skipOwnerReference') === true) {
+//     return {};
+//   }
+//   return {
+//     ownerReferences: [
+//       {
+//         apiVersion: 'apps/v1',
+//         blockOwnerDeletion: true,
+//         controller: true,
+//         kind: 'Deployment',
+//         name: 'wrongsecrets-balancer',
+//         uid: await getJuiceBalancerDeploymentUid(),
+//       },
+//     ],
+//   };
+// }
 
 // TODO fix!
 const getJuiceShopInstances = () =>
@@ -378,16 +381,9 @@ const getJuiceShopInstances = () =>
     //   undefined, //labelSelector
     //   undefined, //limit
     //   `app=wrongsecrets,deployment-context=${get('deploymentContext')}`
-    .listDeploymentForAllNamespaces(
-      true,
-      false,
-      undefined,
-      undefined,
-      undefined,
-      `app=wrongsecrets,deployment-context=${get('deploymentContext')}`
-    )
+    .listDeploymentForAllNamespaces()
     .catch((error) => {
-      throw new Error(error.response.body.message);
+      throw new Error(error);
     });
 module.exports.getJuiceShopInstances = getJuiceShopInstances;
 

wrongsecrets-balancer/ui/src/pages/AdminPage.js

@@ -67,6 +67,10 @@ const messages = defineMessages({
     id: 'admin_table.teamname',
     defaultMessage: 'Teamname',
   },
+  name: {
+    id: 'admin_table.name',
+    defaultMessage: 'Name',
+  },
   ready: {
     id: 'admin_table.ready',
     defaultMessage: 'Ready',
@@ -102,7 +106,7 @@ function RestartInstanceButton({ team }) {
       {restarting ? (
         <FormattedMessage id="admin_table.restarting" defaultMessage="Restarting..." />
       ) : (
-        <FormattedMessage id="admin_table.restart" defaultMessage="Restart" />
+        <FormattedMessage id="admin_table.restart" defaultMessage="Restart-WS" />
       )}
     </SmallSecondary>
   );
@@ -122,7 +126,7 @@ function RestartDesktopInstanceButton({ team }) {
       {restarting ? (
         <FormattedMessage id="admin_table.restarting" defaultMessage="Restarting..." />
       ) : (
-        <FormattedMessage id="admin_table.restart" defaultMessage="Restart" />
+        <FormattedMessage id="admin_table.restart" defaultMessage="Restart-VD" />
       )}
     </SmallSecondary>
   );
@@ -184,6 +188,11 @@ export default function AdminPage() {
       selector: 'team',
       sortable: true,
     },
+    {
+      name: formatMessage(messages.name),
+      selector: 'name',
+      sortable: true,
+    },
     {
       name: formatMessage(messages.ready),
       selector: 'ready',
@@ -226,8 +235,8 @@ export default function AdminPage() {
       cell: ({ team }) => {
         return (
           <>
-            <DeleteInstanceButton team={team} />
-            <RestartInstanceButton team={team} />
+            <DeleteInstanceButton team={team} /><br/>
+            <RestartInstanceButton team={team} /><br/>
             <RestartDesktopInstanceButton team={team} />
           </>
         );