updated documentation and deployment

Author: commjoen

aws/build-an-deploy-aws.sh

@@ -103,6 +103,8 @@ aws secretsmanager put-secret-value --secret-id wrongsecret-2 --secret-string "$
 echo "Generate Parameter store challenge secret"
 aws ssm put-parameter --name wrongsecretvalue --overwrite --type SecureString --value "$(openssl rand -base64 24)" --region $AWS_REGION --output json --no-cli-pager
 
+echo "Installing metrics api-server"
+kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
 
 wait
 

helm/wrongsecrets-ctf-party/values.yaml

@@ -198,7 +198,7 @@ virtualdesktop:
   maxInstances: 500
   # -- Juice Shop Image to use
   image: jeroenwillemsen/wrongsecrets-desktop
-  tag: latest
+  tag: test2
   repository: commjoenie/wrongSecrets
   resources:
     request:

readme.md

@@ -9,7 +9,6 @@ Note that we:
 - A working admin interface which can restart both or delete both (by deleting the full namespace)
 - Do not support any progress watchdog as you will have access to it, we therefore disabled it.
 
-
 ## Special thanks
 Special thanks to Madhu Akula, Ben de Haan, and Mike Woudenberg for making this port a reality!
 
@@ -20,8 +19,11 @@ This environment uses a webtop and an instance of wrongsecrets per user. This me
 - 3.5 GB RAM (min 2.5GB, limit = 3.5GB)
 - 8GB HD (min 3 GB, limit = 8GB)
 
-A 6 contestant game can be played on a local minikube with updated cpu & memory settings.
-A 100 contestant game can be played on the AWS setup, which will require at least 200 CPUs, 350 GB Ram, and 800 GB of storage available in the cluster. 
+### Running this on minikube
+A 3-6 contestant game can be played on a local minikube with updated cpu & memory settings (e.g. 6 CPUs, 9 GB ram).
+
+### Running this on AWS EKS with larger groups
+A 100 contestant game can be played on the AWS setup, which will require around 200 (100-250) CPUs, 300 (250-350) GB Ram, and 800 GB of storage available in the cluster. Note that we have configured everything based on autoscaling in AWS. This means that you can often start with a cluster about 20% of the size of the "limit" numbers and then see how things evolve. If you see heavy under-utilization as players are not very actively engaged: you can often scale down the amount of nodes required.
 
 ## Status
 

wrongsecrets-balancer/src/kubernetes.js

@@ -1096,7 +1096,7 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
             {
               name: 'virtualdesktop',
               //TODO REPLACE HARDCODED BELOW WITH PROPPER GETS: image: `${get('wrongsecrets.image')}:${get('wrongsecrets.tag')}`,
-              image: 'jeroenwillemsen/wrongsecrets-desktop:latest',
+              image: 'jeroenwillemsen/wrongsecrets-desktop:test3',
               imagePullPolicy: get('virtualdesktop.imagePullPolicy'),
               resources: {
                 requests: {
@@ -1122,11 +1122,11 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
                   containerPort: 3000,
                 },
               ],
-              volumeMounts:[
-                {
-                  mountPath: '/config',
-                  name: 'ephemeral',
-                },
+              volumeMounts: [
+                // {
+                //   mountPath: '/config',
+                //   name: 'ephemeral',
+                // },
                 // {
                 //   mountPath: '/defaults',
                 //   name: 'ephemeral-2',
@@ -1164,11 +1164,11 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
             },
           ],
           volumes: [
-            {
-              name: 'ephemeral',
-              emptyDir: {},
-              sizeLimit: '4Gi'
-            },
+            // {
+            //   name: 'ephemeral',
+            //   emptyDir: {},
+            //   sizeLimit: '4Gi',
+            // },
             // {
             //   name: 'ephemeral-2',
             //   emptyDir: {},

wrongsecrets-balancer/src/teams/teams.js

@@ -498,7 +498,9 @@ async function resetPasscode(req, res) {
       return res.status(404).send({ message: 'No instance to reset the passcode for.' });
     }
     logger.error(
-      `Encountered unknown error while resetting passcode hash for deployment: ${JSON.stringify(error)}`
+      `Encountered unknown error while resetting passcode hash for deployment: ${JSON.stringify(
+        error
+      )}`
     );
     // logger.error(error.message);
     return res.status(500).send({ message: 'Unknown error while resetting passcode.' });