quick fixes for k8s

Author: commjoen

build-and-deploy-minikube.sh

@@ -8,7 +8,8 @@ minikube start  --cpus=8 --memory=12000MB --network-plugin=cni --cni=calico --dr
 eval $(minikube docker-env)
 ./build-and-deploy.sh
 
-sleep 15
+echo "Waiting for wrongsecrets-balancer pods to be ready..."
+kubectl wait --for=condition=ready pod -l app=wrongsecrets-balancer --timeout=2s
 
 echo "let's go!"
 

cleaner/src/kubernetes.js

@@ -39,6 +39,7 @@ module.exports.getNamespaces = getNamespaces;
 
 const deleteNamespaceForTeam = async (namespaceName) => {
   await k8sCoreApi.deleteNamespace(namespaceName).catch((error) => {
+    logger.info(error);
     throw new Error(error.response.body.message);
   });
 };

cleaner/src/main.js

@@ -6,6 +6,7 @@ const {
   getNamespaces,
   deleteNamespaceForTeam,
 } = require('./kubernetes');
+const { logger } = require('./logger');
 
 const MaxInactiveDuration = process.env['MAX_INACTIVE_DURATION'];
 const ShouldDelete = process.env['SHOULD_DELETE'];
@@ -55,6 +56,8 @@ async function listOldNamespaces() {
   var namespacesNames = [];
   // Get all namespaces
   const namespaces = await getNamespaces();
+  logger.info(`Found ${namespaces.body.items.length} namespaces.`);
+  // Check if there are no namespaces
   console.log(`Found ${namespaces.body.items.length} namespaces. Checking their activity.`);
   // Loop over all namespaces
   for (const namespace of namespaces.body.items) {

wrongsecrets-balancer/src/kubernetes.js

@@ -293,6 +293,7 @@ const createSealedSecretForTeam = async (team, secretName, secretData) => {
 
 /**
  * Create a sealed secret for challenge 33 specific to the team
+ * TODO: REPLACE WITH CHALLENGE 53 FOR ACTUAL SEALED SECRET
  * @param {string} team - The team name
  */
 const createSealedChallenge33SecretForTeam = async (team) => {
@@ -471,8 +472,9 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
                       key: 'answer',
                     },
                   },
-                }, // ADD THIS MISSING COMMA AND CLOSING BRACKET
-              ], // MAKE SURE THIS CLOSES THE env ARRAY PROPERLY
+               },
+                ...get('wrongsecrets.env', []),
+              ],
               envFrom: get('wrongsecrets.envFrom'),
               ports: [
                 {
@@ -535,6 +537,7 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
   return k8sAppsApi
     .createNamespacedDeployment({namespace:'t-' + team, body: deploymentWrongSecretsConfig})
     .catch((error) => {
+      logger.error(`Failed to create deployment for team ${team}:`, error.body || error.message || error);
       throw new Error(error.response.body.message);
     });
 };