quck fixes

Author: commjoen

wrongsecrets-balancer/src/kubernetes.js

@@ -97,7 +97,7 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
       name: `t-${team}-wrongsecrets`,
       labels: {
         app: 'wrongsecrets',
-        team,
+        team: `${team}`,
         'deployment-context': get('deploymentContext'),
       },
       annotations: {
@@ -113,15 +113,15 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
       selector: {
         matchLabels: {
           app: 'wrongsecrets',
-          team,
+          team: `${team}`,
           'deployment-context': get('deploymentContext'),
         },
       },
       template: {
         metadata: {
           labels: {
             app: 'wrongsecrets',
-            team,
+            team: `${team}`,
             'deployment-context': get('deploymentContext'),
           },
         },
@@ -332,7 +332,7 @@ const createAWSDeploymentForTeam = async ({ team, passcodeHash }) => {
       name: `t-${team}-wrongsecrets`,
       labels: {
         app: 'wrongsecrets',
-        team,
+        team: `${team}`,
         'deployment-context': get('deploymentContext'),
       },
       annotations: {
@@ -348,15 +348,15 @@ const createAWSDeploymentForTeam = async ({ team, passcodeHash }) => {
       selector: {
         matchLabels: {
           app: 'wrongsecrets',
-          team,
+          team: `${team}`,
           'deployment-context': get('deploymentContext'),
         },
       },
       template: {
         metadata: {
           labels: {
             app: 'wrongsecrets',
-            team,
+            team: `${team}`,
             'deployment-context': get('deploymentContext'),
           },
         },
@@ -528,7 +528,7 @@ const createNSPsforTeam = async (team) => {
     kind: 'NetworkPolicy',
     apiVersion: 'networking.k8s.io/v1',
     metadata: {
-      name: 'allow-same-namespace-and-defaults',
+      name: 'allow-same-namespace',
       namespace: `t-${team}`,
     },
     spec: {
@@ -590,7 +590,7 @@ const createNSPsforTeam = async (team) => {
     kind: 'NetworkPolicy',
     apiVersion: 'networking.k8s.io/v1',
     metadata: {
-      name: 'allow-namespace-and-defaults',
+      name: 'allow-ns-to-default-and-back',
       namespace: `t-${team}`,
     },
     spec: {
@@ -652,7 +652,7 @@ const createNSPsforTeam = async (team) => {
     apiVersion: 'networking.k8s.io/v1',
     kind: 'NetworkPolicy',
     metadata: {
-      name: 'allow-webtop-to-talk-tokubesystem',
+      name: 'allow-webtop-kubesystem',
       namespace: `t-${team}`,
     },
     spec: {

wrongsecrets-balancer/src/proxy/proxy.js

@@ -126,7 +126,7 @@ function proxyTrafficToJuiceShop(req, res) {
     req.path === '/files/socket.io/' ||
     req.path === '/files/socket.io/socket.io.js.map'
   ) {
-    logger.info('we have a desktop entry for team ' + teamname);
+    // logger.info('we have a desktop entry for team ' + teamname);
     target = {
       target: `http://${teamname}-virtualdesktop.${teamname}.svc:8080`,
       ws: true,
@@ -137,7 +137,7 @@ function proxyTrafficToJuiceShop(req, res) {
       ws: true,
     };
   }
-  // logger.info(target.target);
+   logger.info(`we got ${teamname} requesting ${target.target}`);
 
   //TODO: FIX THAT THIS WILL WORK IN THE FUTURE!
   if (req.path === '/guaclite') {