underpost 2.92.0 → 2.95.3

package/src/cli/db.js

@@ -25,13 +25,6 @@ const logger = loggerFactory(import.meta);
  */
 const MAX_BACKUP_RETENTION = 5;
 
-/**
- * Timeout for kubectl operations in milliseconds
- * @constant {number} KUBECTL_TIMEOUT
- * @memberof UnderpostDB
- */
-const KUBECTL_TIMEOUT = 300000; // 5 minutes
-
 /**
  * @typedef {Object} DatabaseOptions
  * @memberof UnderpostDB
@@ -49,9 +42,9 @@ const KUBECTL_TIMEOUT = 300000; // 5 minutes
  * @property {string} [paths=''] - Comma-separated list of paths to include
  * @property {string} [labelSelector=''] - Kubernetes label selector for pods
  * @property {boolean} [allPods=false] - Flag to target all matching pods
- * @property {boolean} [dryRun=false] - Flag to simulate operations without executing
  * @property {boolean} [primaryPod=false] - Flag to automatically detect and use MongoDB primary pod
  * @property {boolean} [stats=false] - Flag to display collection/table statistics
+ * @property {boolean} [forceClone=false] - Flag to force remove and re-clone cron backup repository
  */
 
 /**
@@ -171,17 +164,11 @@ class UnderpostDB {
      * @private
      * @param {string} command - kubectl command to execute
      * @param {Object} options - Execution options
-     * @param {boolean} [options.dryRun=false] - Dry run mode
      * @param {string} [options.context=''] - Command context for logging
      * @returns {string|null} Command output or null on error
      */
     _executeKubectl(command, options = {}) {
-      const { dryRun = false, context = '' } = options;
-
-      if (dryRun) {
-        logger.info(`[DRY RUN] Would execute: ${command}`, { context });
-        return null;
-      }
+      const { context = '' } = options;
 
       try {
         logger.info(`Executing kubectl command`, { command, context });
@@ -200,13 +187,12 @@ class UnderpostDB {
      * @param {string} params.podName - Target pod name
      * @param {string} params.namespace - Pod namespace
      * @param {string} params.destPath - Destination path in pod
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    _copyToPod({ sourcePath, podName, namespace, destPath, dryRun = false }) {
+    _copyToPod({ sourcePath, podName, namespace, destPath }) {
       try {
         const command = `sudo kubectl cp ${sourcePath} ${namespace}/${podName}:${destPath}`;
-        UnderpostDB.API._executeKubectl(command, { dryRun, context: `copy to pod ${podName}` });
+        UnderpostDB.API._executeKubectl(command, { context: `copy to pod ${podName}` });
         return true;
       } catch (error) {
         logger.error('Failed to copy file to pod', { sourcePath, podName, destPath, error: error.message });
@@ -222,13 +208,12 @@ class UnderpostDB {
      * @param {string} params.namespace - Pod namespace
      * @param {string} params.sourcePath - Source path in pod
      * @param {string} params.destPath - Destination file path
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    _copyFromPod({ podName, namespace, sourcePath, destPath, dryRun = false }) {
+    _copyFromPod({ podName, namespace, sourcePath, destPath }) {
       try {
         const command = `sudo kubectl cp ${namespace}/${podName}:${sourcePath} ${destPath}`;
-        UnderpostDB.API._executeKubectl(command, { dryRun, context: `copy from pod ${podName}` });
+        UnderpostDB.API._executeKubectl(command, { context: `copy from pod ${podName}` });
         return true;
       } catch (error) {
         logger.error('Failed to copy file from pod', { podName, sourcePath, destPath, error: error.message });
@@ -243,13 +228,12 @@ class UnderpostDB {
      * @param {string} params.podName - Pod name
      * @param {string} params.namespace - Pod namespace
      * @param {string} params.command - Command to execute
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {string|null} Command output or null
      */
-    _execInPod({ podName, namespace, command, dryRun = false }) {
+    _execInPod({ podName, namespace, command }) {
       try {
         const kubectlCmd = `sudo kubectl exec -n ${namespace} -i ${podName} -- sh -c "${command}"`;
-        return UnderpostDB.API._executeKubectl(kubectlCmd, { dryRun, context: `exec in pod ${podName}` });
+        return UnderpostDB.API._executeKubectl(kubectlCmd, { context: `exec in pod ${podName}` });
       } catch (error) {
         logger.error('Failed to execute command in pod', { podName, command, error: error.message });
         throw error;
@@ -263,9 +247,10 @@ class UnderpostDB {
      * @param {string} params.repoName - Repository name
      * @param {string} params.operation - Operation (clone, pull, commit, push)
      * @param {string} [params.message=''] - Commit message
+     * @param {boolean} [params.forceClone=false] - Force remove and re-clone repository
      * @returns {boolean} Success status
      */
-    _manageGitRepo({ repoName, operation, message = '' }) {
+    _manageGitRepo({ repoName, operation, message = '', forceClone = false }) {
       try {
         const username = process.env.GITHUB_USERNAME;
         if (!username) {
@@ -277,6 +262,10 @@ class UnderpostDB {
 
         switch (operation) {
           case 'clone':
+            if (forceClone && fs.existsSync(repoPath)) {
+              logger.info(`Force clone enabled, removing existing repository: ${repoName}`);
+              fs.removeSync(repoPath);
+            }
             if (!fs.existsSync(repoPath)) {
               shellExec(`cd .. && underpost clone ${username}/${repoName}`);
               logger.info(`Cloned repository: ${repoName}`);
@@ -286,7 +275,9 @@ class UnderpostDB {
           case 'pull':
             if (fs.existsSync(repoPath)) {
               shellExec(`cd ${repoPath} && git checkout . && git clean -f -d`);
-              shellExec(`cd ${repoPath} && underpost pull . ${username}/${repoName}`);
+              shellExec(`cd ${repoPath} && underpost pull . ${username}/${repoName}`, {
+                silent: true,
+              });
               logger.info(`Pulled repository: ${repoName}`);
             }
             break;
@@ -301,7 +292,7 @@ class UnderpostDB {
 
           case 'push':
             if (fs.existsSync(repoPath)) {
-              shellExec(`cd ${repoPath} && underpost push . ${username}/${repoName}`, { disableLog: true });
+              shellExec(`cd ${repoPath} && underpost push . ${username}/${repoName}`, { silent: true });
               logger.info(`Pushed repository: ${repoName}`);
             }
             break;
@@ -376,10 +367,9 @@ class UnderpostDB {
      * @param {string} params.user - Database user
      * @param {string} params.password - Database password
      * @param {string} params.sqlPath - SQL file path
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    _importMariaDB({ pod, namespace, dbName, user, password, sqlPath, dryRun = false }) {
+    _importMariaDB({ pod, namespace, dbName, user, password, sqlPath }) {
       try {
         const podName = pod.NAME;
         const containerSqlPath = `/${dbName}.sql`;
@@ -391,7 +381,6 @@ class UnderpostDB {
           podName,
           namespace,
           command: `rm -rf ${containerSqlPath}`,
-          dryRun,
         });
 
         // Copy SQL file to pod
@@ -401,7 +390,6 @@ class UnderpostDB {
             podName,
             namespace,
             destPath: containerSqlPath,
-            dryRun,
           })
         ) {
           return false;
@@ -410,12 +398,12 @@ class UnderpostDB {
         // Create database if it doesn't exist
         UnderpostDB.API._executeKubectl(
           `kubectl exec -n ${namespace} -i ${podName} -- mariadb -p${password} -e 'CREATE DATABASE IF NOT EXISTS ${dbName};'`,
-          { dryRun, context: `create database ${dbName}` },
+          { context: `create database ${dbName}` },
         );
 
         // Import SQL file
         const importCmd = `mariadb -u ${user} -p${password} ${dbName} < ${containerSqlPath}`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: importCmd, dryRun });
+        UnderpostDB.API._execInPod({ podName, namespace, command: importCmd });
 
         logger.info('Successfully imported MariaDB database', { podName, dbName });
         return true;
@@ -435,10 +423,9 @@ class UnderpostDB {
      * @param {string} params.user - Database user
      * @param {string} params.password - Database password
      * @param {string} params.outputPath - Output file path
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    async _exportMariaDB({ pod, namespace, dbName, user, password, outputPath, dryRun = false }) {
+    async _exportMariaDB({ pod, namespace, dbName, user, password, outputPath }) {
       try {
         const podName = pod.NAME;
         const containerSqlPath = `/home/${dbName}.sql`;
@@ -450,12 +437,11 @@ class UnderpostDB {
           podName,
           namespace,
           command: `rm -rf ${containerSqlPath}`,
-          dryRun,
         });
 
         // Dump database
         const dumpCmd = `mariadb-dump --user=${user} --password=${password} --lock-tables ${dbName} > ${containerSqlPath}`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd, dryRun });
+        UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
 
         // Copy SQL file from pod
         if (
@@ -464,14 +450,13 @@ class UnderpostDB {
             namespace,
             sourcePath: containerSqlPath,
             destPath: outputPath,
-            dryRun,
           })
         ) {
           return false;
         }
 
         // Split file if it exists
-        if (!dryRun && fs.existsSync(outputPath)) {
+        if (fs.existsSync(outputPath)) {
           await splitFileFactory(dbName, outputPath);
         }
 
@@ -493,10 +478,9 @@ class UnderpostDB {
      * @param {string} params.bsonPath - BSON directory path
      * @param {boolean} params.drop - Whether to drop existing database
      * @param {boolean} params.preserveUUID - Whether to preserve UUIDs
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    _importMongoDB({ pod, namespace, dbName, bsonPath, drop, preserveUUID, dryRun = false }) {
+    _importMongoDB({ pod, namespace, dbName, bsonPath, drop, preserveUUID }) {
       try {
         const podName = pod.NAME;
         const containerBsonPath = `/${dbName}`;
@@ -508,7 +492,6 @@ class UnderpostDB {
           podName,
           namespace,
           command: `rm -rf ${containerBsonPath}`,
-          dryRun,
         });
 
         // Copy BSON directory to pod
@@ -518,7 +501,6 @@ class UnderpostDB {
             podName,
             namespace,
             destPath: containerBsonPath,
-            dryRun,
           })
         ) {
           return false;
@@ -528,7 +510,7 @@ class UnderpostDB {
         const restoreCmd = `mongorestore -d ${dbName} ${containerBsonPath}${drop ? ' --drop' : ''}${
           preserveUUID ? ' --preserveUUID' : ''
         }`;
-        UnderpostDB.API._execInPod({ podName, namespace, command: restoreCmd, dryRun });
+        UnderpostDB.API._execInPod({ podName, namespace, command: restoreCmd });
 
         logger.info('Successfully imported MongoDB database', { podName, dbName });
         return true;
@@ -547,10 +529,9 @@ class UnderpostDB {
      * @param {string} params.dbName - Database name
      * @param {string} params.outputPath - Output directory path
      * @param {string} [params.collections=''] - Comma-separated collection list
-     * @param {boolean} [params.dryRun=false] - Dry run mode
      * @returns {boolean} Success status
      */
-    _exportMongoDB({ pod, namespace, dbName, outputPath, collections = '', dryRun = false }) {
+    _exportMongoDB({ pod, namespace, dbName, outputPath, collections = '' }) {
       try {
         const podName = pod.NAME;
         const containerBsonPath = `/${dbName}`;
@@ -562,7 +543,6 @@ class UnderpostDB {
           podName,
           namespace,
           command: `rm -rf ${containerBsonPath}`,
-          dryRun,
         });
 
         // Dump database or specific collections
@@ -570,11 +550,11 @@ class UnderpostDB {
           const collectionList = collections.split(',').map((c) => c.trim());
           for (const collection of collectionList) {
             const dumpCmd = `mongodump -d ${dbName} --collection ${collection} -o /`;
-            UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd, dryRun });
+            UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
           }
         } else {
           const dumpCmd = `mongodump -d ${dbName} -o /`;
-          UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd, dryRun });
+          UnderpostDB.API._execInPod({ podName, namespace, command: dumpCmd });
         }
 
         // Copy BSON directory from pod
@@ -584,7 +564,6 @@ class UnderpostDB {
             namespace,
             sourcePath: containerBsonPath,
             destPath: outputPath,
-            dryRun,
           })
         ) {
           return false;
@@ -782,33 +761,26 @@ class UnderpostDB {
      * database connections, backup storage, and optional Git integration for version control.
      * Supports targeting multiple specific pods, nodes, and namespaces with advanced filtering.
      * @param {string} [deployList='default'] - Comma-separated list of deployment IDs
-     * @param {DatabaseOptions} [options] - Database operation options
-     * @returns {Promise<void>}
+     * @param {Object} options - Backup options
+     * @param {boolean} [options.import=false] - Whether to perform import operation
+     * @param {boolean} [options.export=false] - Whether to perform export operation
+     * @param {string} [options.podName=''] - Comma-separated pod name patterns to target
+     * @param {string} [options.nodeName=''] - Comma-separated node names to target
+     * @param {string} [options.ns='default'] - Kubernetes namespace
+     * @param {string} [options.collections=''] - Comma-separated MongoDB collections for export
+     * @param {string} [options.outPath=''] - Output path for backups
+     * @param {boolean} [options.drop=false] - Whether to drop existing database on import
+     * @param {boolean} [options.preserveUUID=false] - Whether to preserve UUIDs on MongoDB import
+     * @param {boolean} [options.git=false] - Whether to use Git for backup versioning
+     * @param {string} [options.hosts=''] - Comma-separated list of hosts to filter databases
+     * @param {string} [options.paths=''] - Comma-separated list of paths to filter databases
+     * @param {string} [options.labelSelector=''] - Label selector for pod filtering
+     * @param {boolean} [options.allPods=false] - Whether to target all pods in deployment
+     * @param {boolean} [options.primaryPod=false] - Whether to target MongoDB primary pod only
+     * @param {boolean} [options.stats=false] - Whether to display database statistics
+     * @param {number} [options.macroRollbackExport=1] - Number of commits to rollback in macro export
+     * @returns {Promise<void>} Resolves when operation is complete
      * @memberof UnderpostDB
-     * @example
-     * // Export database from specific pods
-     * await UnderpostDB.API.callback('dd-myapp', {
-     *   export: true,
-     *   podName: 'mariadb-statefulset-0,mariadb-statefulset-1',
-     *   ns: 'production'
-     * });
-     *
-     * @example
-     * // Import database to all matching pods on specific nodes
-     * await UnderpostDB.API.callback('dd-myapp', {
-     *   import: true,
-     *   nodeName: 'node-1,node-2',
-     *   allPods: true,
-     *   ns: 'staging'
-     * });
-     *
-     * @example
-     * // Import to MongoDB primary pod only
-     * await UnderpostDB.API.callback('dd-myapp', {
-     *   import: true,
-     *   primaryPod: true,
-     *   ns: 'production'
-     * });
      */
     async callback(
       deployList = 'default',
@@ -827,9 +799,10 @@ class UnderpostDB {
         paths: '',
         labelSelector: '',
         allPods: false,
-        dryRun: false,
         primaryPod: false,
         stats: false,
+        macroRollbackExport: 1,
+        forceClone: false,
       },
     ) {
       const newBackupTimestamp = new Date().getTime();
@@ -841,12 +814,13 @@ class UnderpostDB {
         throw new Error(`Invalid namespace: ${namespace}`);
       }
 
+      if (deployList === 'dd') deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
+
       logger.info('Starting database operation', {
         deployList,
         namespace,
         import: options.import,
         export: options.export,
-        dryRun: options.dryRun,
       });
 
       for (const _deployId of deployList.split(',')) {
@@ -891,10 +865,31 @@ class UnderpostDB {
 
         // Handle Git operations
         if (options.git === true) {
-          UnderpostDB.API._manageGitRepo({ repoName, operation: 'clone' });
+          UnderpostDB.API._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
           UnderpostDB.API._manageGitRepo({ repoName, operation: 'pull' });
         }
 
+        if (options.macroRollbackExport) {
+          UnderpostDB.API._manageGitRepo({ repoName, operation: 'clone', forceClone: options.forceClone });
+          UnderpostDB.API._manageGitRepo({ repoName, operation: 'pull' });
+
+          const nCommits = parseInt(options.macroRollbackExport);
+          const repoPath = `../${repoName}`;
+          const username = process.env.GITHUB_USERNAME;
+
+          if (fs.existsSync(repoPath) && username) {
+            logger.info('Executing macro rollback export', { repoName, nCommits });
+            shellExec(`cd ${repoPath} && underpost cmt . reset ${nCommits}`);
+            shellExec(`cd ${repoPath} && git reset`);
+            shellExec(`cd ${repoPath} && git checkout .`);
+            shellExec(`cd ${repoPath} && git clean -f -d`);
+            shellExec(`cd ${repoPath} && underpost push . ${username}/${repoName} -f`);
+          } else {
+            if (!username) logger.error('GITHUB_USERNAME environment variable not set');
+            logger.warn('Repository not found for macro rollback', { repoPath });
+          }
+        }
+
         // Process each database provider
         for (const provider of Object.keys(dbs)) {
           for (const dbName of Object.keys(dbs[provider])) {
@@ -1040,7 +1035,6 @@ class UnderpostDB {
                       user,
                       password,
                       sqlPath: toSqlPath,
-                      dryRun: options.dryRun,
                     });
                   }
 
@@ -1053,7 +1047,6 @@ class UnderpostDB {
                       user,
                       password,
                       outputPath,
-                      dryRun: options.dryRun,
                     });
                   }
                   break;
@@ -1080,7 +1073,6 @@ class UnderpostDB {
                       bsonPath,
                       drop: options.drop,
                       preserveUUID: options.preserveUUID,
-                      dryRun: options.dryRun,
                     });
                   }
 
@@ -1092,7 +1084,6 @@ class UnderpostDB {
                       dbName,
                       outputPath,
                       collections: options.collections,
-                      dryRun: options.dryRun,
                     });
                   }
                   break;
@@ -1136,9 +1127,9 @@ class UnderpostDB {
       host = process.env.DEFAULT_DEPLOY_HOST,
       path = process.env.DEFAULT_DEPLOY_PATH,
     ) {
-      deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
-      host = host ?? process.env.DEFAULT_DEPLOY_HOST;
-      path = path ?? process.env.DEFAULT_DEPLOY_PATH;
+      deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
+      host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
+      path = path ? path : process.env.DEFAULT_DEPLOY_PATH;
 
       logger.info('Creating cluster metadata', { deployId, host, path });
 
@@ -1322,9 +1313,9 @@ class UnderpostDB {
         crons: false,
       },
     ) {
-      deployId = deployId ?? process.env.DEFAULT_DEPLOY_ID;
-      host = host ?? process.env.DEFAULT_DEPLOY_HOST;
-      path = path ?? process.env.DEFAULT_DEPLOY_PATH;
+      deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
+      host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
+      path = path ? path : process.env.DEFAULT_DEPLOY_PATH;
 
       logger.info('Starting cluster metadata backup operation', {
         deployId,

package/src/cli/deploy.js

@@ -657,18 +657,28 @@ EOF`);
      * @param {string} env - Environment for which the status is being checked.
      * @param {string} traffic - Current traffic status for the deployment.
      * @param {Array<string>} ignoresNames - List of pod names to ignore.
+     * @param {string} [namespace='default'] - Kubernetes namespace for the deployment.
      * @returns {object} - Object containing the status of the deployment.
      * @memberof UnderpostDeploy
      */
-    checkDeploymentReadyStatus(deployId, env, traffic, ignoresNames = []) {
+    async checkDeploymentReadyStatus(deployId, env, traffic, ignoresNames = [], namespace = 'default') {
       const cmd = `underpost config get container-status`;
-      const pods = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`);
+      const pods = UnderpostDeploy.API.get(`${deployId}-${env}-${traffic}`, 'pods', namespace);
       const readyPods = [];
       const notReadyPods = [];
       for (const pod of pods) {
         const { NAME } = pod;
         if (ignoresNames && ignoresNames.find((t) => NAME.trim().toLowerCase().match(t.trim().toLowerCase()))) continue;
-        const out = shellExec(`sudo kubectl exec -i ${NAME} -- sh -c "${cmd}"`, { stdout: true, silent: true });
+        const out = await new Promise((resolve) => {
+          shellExec(`sudo kubectl exec -i ${NAME} -n ${namespace} -- sh -c "${cmd}"`, {
+            silent: true,
+            disableLog: true,
+            callback: function (code, stdout, stderr) {
+              return resolve(JSON.stringify({ code, stdout, stderr }));
+            },
+          });
+        });
+        pod.out = out;
         const ready = out.match(`${deployId}-${env}-running-deployment`);
         ready ? readyPods.push(pod) : notReadyPods.push(pod);
       }
@@ -893,15 +903,18 @@ ${renderHosts}`,
      * @param {string} env - Environment for which the ready status is being monitored.
      * @param {string} targetTraffic - Target traffic status for the deployment.
      * @param {Array<string>} ignorePods - List of pod names to ignore.
+     * @param {string} [namespace='default'] - Kubernetes namespace for the deployment.
+     * @param {string} [outLogType=''] - Type of log output.
      * @returns {object} - Object containing the ready status of the deployment.
      * @memberof UnderpostDeploy
      */
-    async monitorReadyRunner(deployId, env, targetTraffic, ignorePods = []) {
+    async monitorReadyRunner(deployId, env, targetTraffic, ignorePods = [], namespace = 'default', outLogType = '') {
       let checkStatusIteration = 0;
       const checkStatusIterationMsDelay = 1000;
       const maxIterations = 500;
-      const iteratorTag = `[${deployId}-${env}-${targetTraffic}]`;
-      logger.info('Deployment init', { deployId, env, targetTraffic, checkStatusIterationMsDelay });
+      const deploymentId = `${deployId}-${env}-${targetTraffic}`;
+      const iteratorTag = `[${deploymentId}]`;
+      logger.info('Deployment init', { deployId, env, targetTraffic, checkStatusIterationMsDelay, namespace });
       const minReadyOk = 3;
       let readyOk = 0;
       let result = {
@@ -909,7 +922,7 @@ ${renderHosts}`,
         notReadyPods: [],
         readyPods: [],
       };
-
+      let lastMsg = {};
       while (readyOk < minReadyOk) {
         if (checkStatusIteration >= maxIterations) {
           logger.error(
@@ -917,30 +930,81 @@ ${renderHosts}`,
           );
           break;
         }
-        result = UnderpostDeploy.API.checkDeploymentReadyStatus(deployId, env, targetTraffic, ignorePods);
+        result = await UnderpostDeploy.API.checkDeploymentReadyStatus(
+          deployId,
+          env,
+          targetTraffic,
+          ignorePods,
+          namespace,
+        );
         if (result.ready === true) {
           readyOk++;
           logger.info(`${iteratorTag} | Deployment ready. Verification number: ${readyOk}`);
+          for (const pod of result.readyPods) {
+            const { NAME } = pod;
+            lastMsg[NAME] = 'Deployment ready';
+            console.log(
+              'Target pod:',
+              NAME[NAME.match('green') ? 'bgGreen' : 'bgBlue'].bold.black,
+              '| Status:',
+              lastMsg[NAME].bold.magenta,
+            );
+          }
+        }
+
+        switch (outLogType) {
+          case 'underpost': {
+            let indexOf = -1;
+            for (const pod of result.notReadyPods) {
+              indexOf++;
+              const { NAME, out } = pod;
+
+              if (out.match('not') && out.match('found') && checkStatusIteration <= 20 && out.match(deploymentId))
+                lastMsg[NAME] = 'Starting deployment';
+              else if (out.match('not') && out.match('found') && checkStatusIteration <= 20 && out.match('underpost'))
+                lastMsg[NAME] = 'Installing underpost cli';
+              else if (out.match('not') && out.match('found') && checkStatusIteration <= 20 && out.match('task'))
+                lastMsg[NAME] = 'Initializing setup task';
+              else if (out.match('Empty environment variables')) lastMsg[NAME] = 'Setup environment';
+              else if (out.match(`${deployId}-${env}-build-deployment`)) lastMsg[NAME] = 'Building apps/services';
+              else if (out.match(`${deployId}-${env}-initializing-deployment`))
+                lastMsg[NAME] = 'Initializing apps/services';
+              else if (!lastMsg[NAME]) lastMsg[NAME] = `Waiting for status`;
+
+              console.log(
+                'Target pod:',
+                NAME[NAME.match('green') ? 'bgGreen' : 'bgBlue'].bold.black,
+                '| Status:',
+                lastMsg[NAME].bold.magenta,
+              );
+            }
+          }
         }
         await timer(checkStatusIterationMsDelay);
         checkStatusIteration++;
         logger.info(
-          `${iteratorTag} | Deployment in progress... | Delay number check iterations: ${checkStatusIteration}`,
+          `${iteratorTag} | Deployment in progress... | Delay number monitor iterations: ${checkStatusIteration}`,
         );
       }
-      logger.info(`${iteratorTag} | Deployment ready. | Total delay number check iterations: ${checkStatusIteration}`);
+      logger.info(
+        `${iteratorTag} | Deployment ready. | Total delay number monitor iterations: ${checkStatusIteration}`,
+      );
       return result;
     },
 
     /**
      * Retrieves the currently loaded images in the Kubernetes cluster.
+     * @param {string} [node='kind-worker'] - Node name to check for loaded images.
+     * @param {object} options - Options for the image retrieval.
+     * @param {boolean} options.spec - Whether to retrieve images from the pod specifications.
+     * @param {string} options.namespace - Kubernetes namespace to filter pods.
      * @returns {Array<object>} - Array of objects containing pod names and their corresponding images.
      * @memberof UnderpostDeploy
      */
-    getCurrentLoadedImages(node = 'kind-worker', specContainers = false) {
-      if (specContainers) {
+    getCurrentLoadedImages(node = 'kind-worker', options = { spec: false, namespace: '' }) {
+      if (options.spec) {
         const raw = shellExec(
-          `kubectl get pods --all-namespaces -o=jsonpath='{range .items[*]}{"\\n"}{.metadata.namespace}{"/"}{.metadata.name}{":\\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}'`,
+          `kubectl get pods ${options.namespace ? `--namespace ${options.namespace}` : `--all-namespaces`} -o=jsonpath='{range .items[*]}{"\\n"}{.metadata.namespace}{"/"}{.metadata.name}{":\\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}'`,
           {
             stdout: true,
             silent: true,