Merge pull request #65 from commjoen/fix-docker-volume

Fix docker volume

Author: commjoen

aws/build-an-deploy-aws.sh

@@ -111,4 +111,4 @@ wait
 DEFAULT_PASSWORD=thankyou
 #TODO: REWRITE ABOVE, REWRITE THE HARDCODED DEPLOYMENT VALS INTO VALUES AND OVERRIDE THEM HERE!
 echo "default password is ${DEFAULT_PASSWORD}"
-helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.93aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"
+helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.95aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/deployment.yaml

@@ -58,6 +58,8 @@ spec:
               value: {{ .Values.balancer.env.IRSA_ROLE }} #REPLACE WITH THE ACTUAL AWS ROLE IF IN AWS MODE
             - name: WRONGSECRETS_TAG
               value: {{ .Values.wrongsecrets.tag}}
+            - name: WRONGSECRETS_DESKTOP_TAG
+              value: 1.5.7RC1
             - name: SECRETS_MANAGER_SECRET_ID_1
               value: {{ .Values.balancer.env.SECRETS_MANAGER_SECRET_ID_1 }}
             - name: SECRETS_MANAGER_SECRET_ID_2

helm/wrongsecrets-ctf-party/values.yaml

@@ -35,7 +35,7 @@ balancer:
     # -- Set this to a fixed random alpa-numeric string (recommended length 24 chars). If not set this get randomly generated with every helm upgrade, each rotation invalidates all active cookies / sessions requirering users to login again.
     cookieParserSecret: null
   repository: jeroenwillemsen/wrongsecrets-balancer
-  tag: 0.93aws
+  tag: 0.95aws
   # -- Number of replicas of the wrongsecrets-balancer deployment
   replicas: 1
   service:

wrongsecrets-balancer/src/kubernetes.js

@@ -19,6 +19,7 @@ const awsAccountEnv = process.env.IRSA_ROLE;
 const secretsmanagerSecretName1 = process.env.SECRETS_MANAGER_SECRET_ID_1;
 const secretsmanagerSecretName2 = process.env.SECRETS_MANAGER_SECRET_ID_2;
 const wrongSecretsContainterTag = process.env.WRONGSECRETS_TAG;
+const wrongSecretsDekstopTag = process.env.WRONGSECRETS_DESKTOP_TAG;
 const heroku_wrongsecret_ctf_url = process.env.REACT_APP_HEROKU_WRONGSECRETS_URL;
 
 const { get } = require('./config');
@@ -1086,26 +1087,20 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
         },
         spec: {
           serviceAccountName: 'webtop-sa',
-          //automountServiceAccountToken: false,
-          // securityContext: {
-          //   runAsUser: 911,
-          //   runAsGroup: 911,
-          //   fsGroup: 911,
-          // },
           containers: [
             {
               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-k8s:${wrongSecretsDekstopTag}`,
               imagePullPolicy: get('virtualdesktop.imagePullPolicy'),
               resources: {
                 requests: {
-                  memory: '2G',
+                  memory: '2.5G',
                   cpu: '800m',
                   'ephemeral-storage': '4Gi',
                 },
                 limits: {
-                  memory: '3G',
+                  memory: '3.5G',
                   cpu: '2000m',
                   'ephemeral-storage': '8Gi',
                 },
@@ -1123,26 +1118,10 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
                 },
               ],
               volumeMounts: [
-                // {
-                //   mountPath: '/config',
-                //   name: 'ephemeral',
-                // },
-                // {
-                //   mountPath: '/defaults',
-                //   name: 'ephemeral-2',
-                // },
-                // {
-                //   mountPath: '/etc',
-                //   name: 'ephemeral-3',
-                // },
-                // {
-                //   mountPath: '/app',
-                //   name: 'ephemeral-4',
-                // },
-                // {
-                //   mountPath: '/run',
-                //   name: 'ephemeral-5',
-                // },
+                {
+                  mountPath: '/config',
+                  name: 'config-fs',
+                },
               ],
               readinessProbe: {
                 httpGet: {
@@ -1164,27 +1143,13 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
             },
           ],
           volumes: [
-            // {
-            //   name: 'ephemeral',
-            //   emptyDir: {},
-            //   sizeLimit: '4Gi',
-            // },
-            // {
-            //   name: 'ephemeral-2',
-            //   emptyDir: {},
-            // },
-            // {
-            //   name: 'ephemeral-3',
-            //   emptyDir: {},
-            // },
-            // {
-            //   name: 'ephemeral-4',
-            //   emptyDir: {},
-            // },
-            // {
-            //   name: 'ephemeral-5',
-            //   emptyDir: {},
-            // },
+            {
+              emptyDir: {
+                medium: 'Memory',
+                sizeLimit: '128Mi',
+              },
+              name: 'config-fs',
+            },
           ],
           tolerations: get('virtualdesktop.tolerations'),
           affinity: get('virtualdesktop.affinity'),