cyberia 3.0.2 → 3.1.3

package/src/api/object-layer/object-layer.service.js

@@ -46,7 +46,7 @@ const ObjectLayerService = {
    * - Default — Create an object layer directly from the request body.
    *
    * The `/metadata` and default routes delegate to {@link ObjectLayerEngine.createObjectLayerDocuments}
-   * for centralized document creation, atlas generation, SHA-256 computation, and IPFS pinning.
+   * for document creation, atlas generation, SHA-256 computation, and IPFS pinning.
    *
    * @async
    * @function post
@@ -148,7 +148,7 @@ const ObjectLayerService = {
       fs.writeFileSync(`${folder}/metadata.json`, metadataContent);
       fs.writeFileSync(`${publicFolder}/metadata.json`, metadataContent);
 
-      // Build object layer data from the asset directory using centralized logic
+      // Build object layer data from the asset directory
       const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
       const ObjectLayerRenderFrames =
         DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
@@ -161,7 +161,6 @@ const ObjectLayerService = {
           metadataOverride: req.body,
         });
 
-      // Create documents using centralized engine method (with atlas generation)
       const { objectLayer } = await ObjectLayerEngine.createObjectLayerDocuments({
         ObjectLayer,
         ObjectLayerRenderFrames,
@@ -189,14 +188,14 @@ const ObjectLayerService = {
       DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
     let newObjectLayer = await new ObjectLayer(req.body).save();
 
-    // Generate atlas sprite sheet – this sets data.atlasSpriteSheetCid and saves
+    // Generate atlas sprite sheet – this sets data.render.cid and saves
     try {
       await AtlasSpriteSheetService.generate({ params: { id: newObjectLayer._id }, auth: req.auth }, res, options);
     } catch (atlasError) {
       logger.error('Failed to auto-generate atlas for new ObjectLayer:', atlasError);
     }
 
-    // Re-read so data.atlasSpriteSheetCid is up-to-date, then recompute SHA-256 & IPFS CID
+    // Re-read so data.render.cid is up-to-date, then recompute SHA-256 & IPFS CID
     newObjectLayer = await ObjectLayer.findById(newObjectLayer._id).populate('objectLayerRenderFramesId');
     if (newObjectLayer) {
       newObjectLayer = await ObjectLayerEngine.computeAndSaveFinalSha256({
@@ -519,7 +518,7 @@ const ObjectLayerService = {
    * - `/:id` — Standard update from request body.
    *
    * The `/metadata` route delegates to {@link ObjectLayerEngine.updateObjectLayerDocuments}
-   * for centralized document update, atlas regeneration, SHA-256 computation, and IPFS pinning.
+   * for document update, atlas regeneration, SHA-256 computation, and IPFS pinning.
    *
    * @async
    * @function put
@@ -636,7 +635,7 @@ const ObjectLayerService = {
       const ObjectLayerRenderFrames =
         DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
 
-      // Build object layer data from the asset directory using centralized logic
+      // Build object layer data from the asset directory
       const { objectLayerRenderFramesData, objectLayerData } =
         await ObjectLayerEngine.buildObjectLayerDataFromDirectory({
           folder,
@@ -645,12 +644,7 @@ const ObjectLayerService = {
           metadataOverride: req.body,
         });
 
-      // Preserve the existing seed if provided in the request body
-      if (req.body.data && req.body.data.seed) {
-        objectLayerData.data.seed = req.body.data.seed;
-      }
-
-      // Update documents using centralized engine method (with atlas generation)
+      // Update documents using engine method (with atlas generation)
       const { objectLayer } = await ObjectLayerEngine.updateObjectLayerDocuments({
         objectLayerId,
         ObjectLayer,
@@ -674,17 +668,17 @@ const ObjectLayerService = {
     }
 
     // PUT /:id - Standard update
-    let updatedObjectLayer = await ObjectLayer.findByIdAndUpdate(req.params.id, req.body, { new: true });
+    let updatedObjectLayer = await ObjectLayer.findByIdAndUpdate(req.params.id, req.body, { returnDocument: 'after' });
 
     if (updatedObjectLayer) {
-      // Generate atlas sprite sheet – this sets data.atlasSpriteSheetCid and saves
+      // Generate atlas sprite sheet – this sets data.render.cid and saves
       try {
         await AtlasSpriteSheetService.generate({ params: { id: req.params.id }, auth: req.auth }, res, options);
       } catch (atlasError) {
         logger.error('Failed to auto-update atlas for ObjectLayer:', atlasError);
       }
 
-      // Re-read so data.atlasSpriteSheetCid is up-to-date, then recompute SHA-256 & IPFS CID
+      // Re-read so data.render.cid is up-to-date, then recompute SHA-256 & IPFS CID
       updatedObjectLayer = await ObjectLayer.findById(req.params.id).populate('objectLayerRenderFramesId');
       if (updatedObjectLayer) {
         updatedObjectLayer = await ObjectLayerEngine.computeAndSaveFinalSha256({

package/src/api/object-layer-render-frames/object-layer-render-frames.model.js

@@ -77,12 +77,11 @@ const ObjectLayerRenderFramesSchema = new Schema(
 );
 
 // Pre-save hook to ensure data consistency
-ObjectLayerRenderFramesSchema.pre('save', function (next) {
+ObjectLayerRenderFramesSchema.pre('save', function () {
   // Ensure all required fields are present
   if (!this.frames || !this.colors || this.frame_duration === undefined) {
     throw new Error('Missing required fields: frames, colors, or frame_duration');
   }
-  next();
 });
 
 // Create and export the model

package/src/api/user/user.router.js

@@ -30,12 +30,15 @@ const UserRouter = (options) => {
             emailConfirmed: true,
             publicKey: [],
           });
-          logger.warn('Default admin user created. Please change the default password immediately!', result._doc);
+          logger.warn('Default admin user created. Please change the default password immediately!', {
+            username: result._doc.username,
+            email: result._doc.email,
+            role: result._doc.role,
+          });
         }
       }
     } catch (error) {
-      logger.error('Error checking/creating admin user');
-      console.log(error);
+      logger.error('Error checking/creating admin user', { error: error.message });
     }
 
     // Cache mailer images
@@ -46,10 +49,12 @@ const UserRouter = (options) => {
         check: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-check.png`),
         avatar: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-default-avatar.png`),
       },
-      header: (res) => {
+      header: (res, req) => {
         res.set('Cross-Origin-Resource-Policy', 'cross-origin');
-        res.set('Access-Control-Allow-Origin', '*');
         res.set('Access-Control-Allow-Headers', '*');
+        if (req && req.headers && req.headers.origin) {
+          res.set('Access-Control-Allow-Origin', req.headers.origin);
+        } else res.setHeader('Access-Control-Allow-Origin', '*');
         res.set('Content-Type', 'image/png');
       },
     };

package/src/api/user/user.service.js

@@ -265,7 +265,7 @@ const UserService = {
     }
 
     if (req.path.startsWith('/assets')) {
-      options.png.header(res);
+      options.png.header(res, req);
       return options.png.buffer[req.params.id];
     }
 
@@ -281,7 +281,7 @@ const UserService = {
         payload = verifyJWT(req.params.id, options);
       } catch (error) {
         logger.error(error, { 'req.params.id': req.params.id });
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['invalid-token'];
       }
       const user = await User.findOne({
@@ -294,10 +294,10 @@ const UserService = {
           { recoverTimeOut: new Date(+new Date() + 1000 * 60 * 15) },
           { runValidators: true },
         );
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['recover'];
       } else {
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['invalid-token'];
       }
     }
@@ -308,7 +308,7 @@ const UserService = {
         payload = verifyJWT(req.params.id, options);
       } catch (error) {
         logger.error(error, { 'req.params.id': req.params.id });
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['invalid-token'];
       }
       const user = await User.findOne({
@@ -324,10 +324,10 @@ const UserService = {
           status: 'email-confirmed',
           id: userWsId,
         });
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['check'];
       } else {
-        options.png.header(res);
+        options.png.header(res, req);
         return options.png.buffer['invalid-token'];
       }
     }

package/src/cli/baremetal.js

@@ -135,9 +135,6 @@ class UnderpostBaremetal {
     ) {
       let { ipAddress, hostname, ipFileServer, ipConfig, netmask, dnsServer } = options;
 
-      // Load environment variables from .env file, overriding existing ones if present.
-      dotenv.config({ path: `${getUnderpostRootPath()}/.env`, override: true });
-
       // Determine the root path for npm and underpost.
       const npmRoot = getNpmRootPath();
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
@@ -1147,9 +1144,8 @@ rm -rf ${artifacts.join(' ')}`);
           machine: machine ? machine.system_id : null,
         });
 
-        const { discovery, machine: discoveredMachine } = await Underpost.baremetal.commissionMonitor(
-          commissionMonitorPayload,
-        );
+        const { discovery, machine: discoveredMachine } =
+          await Underpost.baremetal.commissionMonitor(commissionMonitorPayload);
         if (discoveredMachine) machine = discoveredMachine;
       }
     },
@@ -2494,10 +2490,10 @@ fi
           const discoverHostname = discovery.hostname
             ? discovery.hostname
             : discovery.mac_organization
-            ? discovery.mac_organization
-            : discovery.domain
-            ? discovery.domain
-            : `generic-host-${s4()}${s4()}`;
+              ? discovery.mac_organization
+              : discovery.domain
+                ? discovery.domain
+                : `generic-host-${s4()}${s4()}`;
 
           console.log(discoverHostname.bgBlue.bold.white);
           console.log('ip target:'.green + ipAddress, 'ip discovered:'.green + discovery.ip);

package/src/cli/cloud-init.js

@@ -5,15 +5,12 @@
  * @namespace UnderpostCloudInit
  */
 
-import dotenv from 'dotenv';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import { loggerFactory } from '../server/logger.js';
 import { getNpmRootPath } from '../server/conf.js';
 import Underpost from '../index.js';
 
-dotenv.config();
-
 const logger = loggerFactory(import.meta);
 
 /**

package/src/cli/db.js

@@ -6,15 +6,30 @@
  * Supports MariaDB and MongoDB with import/export capabilities, Git integration, and multi-pod operations.
  */
 
-import { mergeFile, splitFileFactory } from '../server/conf.js';
+import { mergeFile, splitFileFactory, loadConfServerJson, resolveConfSecrets } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
-import { loadReplicas, pathPortAssignmentFactory } from '../server/conf.js';
+import { loadReplicas, pathPortAssignmentFactory, loadCronDeployEnv } from '../server/conf.js';
 import Underpost from '../index.js';
 const logger = loggerFactory(import.meta);
 
+/**
+ * Redacts credentials from shell command strings before logging.
+ * Masks passwords in `-p<password>`, `--password=<password>`, and `-P <password>` patterns.
+ * @param {string} cmd - The raw command string.
+ * @memberof UnderpostDB
+ * @returns {string} The command with credentials replaced by `***`.
+ */
+const sanitizeCommand = (cmd) => {
+  if (typeof cmd !== 'string') return cmd;
+  return cmd
+    .replace(/-p['"]?[^\s'"]+/g, '-p***')
+    .replace(/--password=['"]?[^\s'"]+/g, '--password=***')
+    .replace(/-P\s+['"]?[^\s'"]+/g, '-P ***');
+};
+
 /**
  * Constants for database operations
  * @constant {number} MAX_BACKUP_RETENTION - Maximum number of backups to retain
@@ -133,10 +148,10 @@ class UnderpostDB {
       const { context = '' } = options;
 
       try {
-        logger.info(`Executing kubectl command`, { command, context });
-        return shellExec(command, { stdout: true });
+        logger.info(`Executing kubectl command`, { command: sanitizeCommand(command), context });
+        return shellExec(command, { stdout: true, disableLog: true });
       } catch (error) {
-        logger.error(`kubectl command failed`, { command, error: error.message, context });
+        logger.error(`kubectl command failed`, { command: sanitizeCommand(command), error: error.message, context });
         throw error;
       }
     },
@@ -200,11 +215,30 @@ class UnderpostDB {
         const kubectlCmd = `sudo kubectl exec -n ${namespace} -i ${podName} -- sh -c "${command}"`;
         return Underpost.db._executeKubectl(kubectlCmd, { context: `exec in pod ${podName}` });
       } catch (error) {
-        logger.error('Failed to execute command in pod', { podName, command, error: error.message });
+        logger.error('Failed to execute command in pod', {
+          podName,
+          command: sanitizeCommand(command),
+          error: error.message,
+        });
         throw error;
       }
     },
 
+    /**
+     * Helper: Resolves the latest backup timestamp from an existing backup directory.
+     * Scans the directory for numeric (epoch) sub-folders and returns the most recent one.
+     * @method _getLatestBackupTimestamp
+     * @memberof UnderpostDB
+     * @param {string} backupDir - Path to the host-folder backup directory.
+     * @return {string|null} The latest timestamp string, or null if none found.
+     */
+    _getLatestBackupTimestamp(backupDir) {
+      if (!fs.existsSync(backupDir)) return null;
+      const entries = fs.readdirSync(backupDir).filter((e) => /^\d+$/.test(e));
+      if (entries.length === 0) return null;
+      return entries.sort((a, b) => parseInt(b) - parseInt(a))[0];
+    },
+
     /**
      * Helper: Manages Git repository for backups.
      * @method _manageGitRepo
@@ -275,55 +309,6 @@ class UnderpostDB {
       }
     },
 
-    /**
-     * Helper: Manages backup timestamps and cleanup.
-     * @method _manageBackupTimestamps
-     * @memberof UnderpostDB
-     * @param {string} backupPath - Backup directory path.
-     * @param {number} newTimestamp - New backup timestamp.
-     * @param {boolean} shouldCleanup - Whether to cleanup old backups.
-     * @return {Object} Backup info with current and removed timestamps.
-     */
-    _manageBackupTimestamps(backupPath, newTimestamp, shouldCleanup) {
-      try {
-        if (!fs.existsSync(backupPath)) {
-          fs.mkdirSync(backupPath, { recursive: true });
-        }
-
-        // Delete empty folders
-        shellExec(`cd ${backupPath} && find . -type d -empty -delete`);
-
-        const times = fs.readdirSync(backupPath);
-        const validTimes = times.map((t) => parseInt(t)).filter((t) => !isNaN(t));
-
-        const currentBackupTimestamp = validTimes.length > 0 ? Math.max(...validTimes) : null;
-        const removeBackupTimestamp = validTimes.length > 0 ? Math.min(...validTimes) : null;
-
-        // Cleanup old backups if we have too many
-        if (shouldCleanup && validTimes.length >= MAX_BACKUP_RETENTION && removeBackupTimestamp) {
-          const removeDir = `${backupPath}/${removeBackupTimestamp}`;
-          logger.info('Removing old backup', { path: removeDir });
-          fs.removeSync(removeDir);
-        }
-
-        // Create new backup directory
-        if (shouldCleanup) {
-          const newBackupDir = `${backupPath}/${newTimestamp}`;
-          logger.info('Creating new backup directory', { path: newBackupDir });
-          fs.mkdirSync(newBackupDir, { recursive: true });
-        }
-
-        return {
-          current: currentBackupTimestamp,
-          removed: removeBackupTimestamp,
-          count: validTimes.length,
-        };
-      } catch (error) {
-        logger.error('Error managing backup timestamps', { backupPath, error: error.message });
-        return { current: null, removed: null, count: 0 };
-      }
-    },
-
     /**
      * Helper: Performs MariaDB import operation.
      * @method _importMariaDB
@@ -624,7 +609,7 @@ class UnderpostDB {
         logger.info('Getting MariaDB table statistics', { podName, dbName });
 
         const command = `sudo kubectl exec -n ${namespace} -i ${podName} -- mariadb -u ${user} -p${password} ${dbName} -e "SELECT TABLE_NAME as 'table', TABLE_ROWS as 'count' FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${dbName}' ORDER BY TABLE_NAME;" --skip-column-names --batch`;
-        const output = shellExec(command, { stdout: true, silent: true });
+        const output = shellExec(command, { stdout: true, silent: true, disableLog: true });
 
         if (!output || output.trim() === '') {
           logger.warn('No tables found or empty output');
@@ -788,6 +773,7 @@ class UnderpostDB {
         kind: false,
       },
     ) {
+      loadCronDeployEnv();
       const newBackupTimestamp = new Date().getTime();
       const namespace = options.ns && typeof options.ns === 'string' ? options.ns : 'default';
 
@@ -844,7 +830,7 @@ class UnderpostDB {
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
+        const confServer = loadConfServerJson(confServerPath, { resolve: true });
 
         // Build database configuration map
         for (const host of Object.keys(confServer)) {
@@ -943,16 +929,11 @@ class UnderpostDB {
 
             logger.info('Processing database', { hostFolder, provider, dbName, deployId });
 
-            const backUpPath = `../${repoName}/${hostFolder}`;
-            const backupInfo = Underpost.db._manageBackupTimestamps(
-              backUpPath,
-              newBackupTimestamp,
-              options.export === true,
-            );
+            const latestBackupTimestamp = Underpost.db._getLatestBackupTimestamp(`../${repoName}/${hostFolder}`);
 
-            dbs[provider][dbName].currentBackupTimestamp = backupInfo.current;
+            dbs[provider][dbName].currentBackupTimestamp = latestBackupTimestamp;
 
-            const currentTimestamp = backupInfo.current || newBackupTimestamp;
+            const currentTimestamp = latestBackupTimestamp || newBackupTimestamp;
             const sqlContainerPath = `/home/${dbName}.sql`;
             const fromPartsPath = `../${repoName}/${hostFolder}/${currentTimestamp}/${dbName}-parths.json`;
             const toSqlPath = `../${repoName}/${hostFolder}/${currentTimestamp}/${dbName}.sql`;
@@ -1149,6 +1130,7 @@ class UnderpostDB {
       host = process.env.DEFAULT_DEPLOY_HOST,
       path = process.env.DEFAULT_DEPLOY_PATH,
     ) {
+      loadCronDeployEnv();
       deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
       host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
       path = path ? path : process.env.DEFAULT_DEPLOY_PATH;
@@ -1171,7 +1153,7 @@ class UnderpostDB {
         throw new Error(`Server configuration not found: ${confServerPath}`);
       }
 
-      const { db } = JSON.parse(fs.readFileSync(confServerPath, 'utf8'))[host][path];
+      const { db } = loadConfServerJson(confServerPath, { resolve: true })[host][path];
 
       try {
         await DataBaseProvider.load({ apis: ['instance', 'cron'], host, path, db });
@@ -1194,7 +1176,7 @@ class UnderpostDB {
             continue;
           }
 
-          const confServer = loadReplicas(deployId, JSON.parse(fs.readFileSync(confServerPath, 'utf8')));
+          const confServer = loadReplicas(deployId, loadConfServerJson(confServerPath, { resolve: true }));
           const router = await Underpost.deploy.routerFactory(deployId, env);
           const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
 
@@ -1257,7 +1239,7 @@ class UnderpostDB {
           }
         }
       } catch (error) {
-        logger.error('Failed to create instance metadata', { error: error.message, stack: error.stack });
+        logger.error('Failed to create instance metadata', { error: error.message });
         throw error;
       }
 
@@ -1297,7 +1279,7 @@ class UnderpostDB {
           await new Cron(body).save();
         }
       } catch (error) {
-        logger.error('Failed to create cron metadata', { error: error.message, stack: error.stack });
+        logger.error('Failed to create cron metadata', { error: error.message });
       }
 
       await DataBaseProvider.instance[`${host}${path}`].mongoose.close();
@@ -1325,6 +1307,7 @@ class UnderpostDB {
         dryRun: false,
       },
     ) {
+      loadCronDeployEnv();
       if (deployList === 'dd') deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
 
       logger.info('Starting File collection cleanup', { deployList, options });
@@ -1359,7 +1342,7 @@ class UnderpostDB {
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(confServerPath, 'utf8'));
+        const confServer = loadConfServerJson(confServerPath, { resolve: true });
 
         // Process each host+path combination
         for (const host of Object.keys(confServer)) {
@@ -1499,7 +1482,6 @@ class UnderpostDB {
                 host,
                 path,
                 error: error.message,
-                stack: error.stack,
               });
             }
           }
@@ -1553,6 +1535,7 @@ class UnderpostDB {
         crons: false,
       },
     ) {
+      loadCronDeployEnv();
       deployId = deployId ? deployId : process.env.DEFAULT_DEPLOY_ID;
       host = host ? host : process.env.DEFAULT_DEPLOY_HOST;
       path = path ? path : process.env.DEFAULT_DEPLOY_PATH;

package/src/cli/deploy.js

@@ -11,6 +11,7 @@ import {
   Config,
   deployRangePortFactory,
   getDataDeploy,
+  loadConfServerJson,
   loadReplicas,
   pathPortAssignmentFactory,
 } from '../server/conf.js';
@@ -132,7 +133,7 @@ class UnderpostDeploy {
           `npm install -g npm@11.2.0`,
           `npm install -g underpost`,
           `underpost secret underpost --create-from-file /etc/config/.env.${env}`,
-          `underpost start --build --run --underpost-quickly-install ${deployId} ${env}`,
+          `underpost start --build --run ${deployId} ${env}`,
         ];
       const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
       if (!volumes)
@@ -230,7 +231,7 @@ spec:
         if (!deployId) continue;
         const confServer = loadReplicas(
           deployId,
-          JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')),
+          loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`),
         );
         const router = await Underpost.deploy.routerFactory(deployId, env);
         const pathPortAssignmentData = await pathPortAssignmentFactory(deployId, router, confServer);
@@ -259,6 +260,27 @@ ${Underpost.deploy
         }
         fs.writeFileSync(`./engine-private/conf/${deployId}/build/${env}/deployment.yaml`, deploymentYamlParts, 'utf8');
 
+        const confVolume = fs.existsSync(`./engine-private/conf/${deployId}/conf.volume.json`)
+          ? JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.volume.json`, 'utf8'))
+          : [];
+        if (confVolume.length > 0) {
+          let volumeYaml = '';
+          for (const deploymentVersion of deploymentVersions) {
+            for (const volume of confVolume) {
+              if (!volume.claimName) continue;
+              const pvcId = `${volume.claimName}-${deployId}-${env}-${deploymentVersion}`;
+              const pvId = pvcId.replace(/^pvc-/, 'pv-');
+              const hostPath = `/home/dd/engine/volume/${pvId}`;
+              volumeYaml += `---\n${Underpost.deploy.persistentVolumeFactory({
+                pvcId,
+                namespace: options.namespace,
+                hostPath,
+              })}\n`;
+            }
+          }
+          fs.writeFileSync(`./engine-private/conf/${deployId}/build/${env}/pv-pvc.yaml`, volumeYaml, 'utf8');
+        }
+
         let proxyYaml = '';
         let secretYaml = '';
         const customServices = fs.existsSync(`./engine-private/conf/${deployId}/conf.services.json`)
@@ -335,7 +357,7 @@ ${Underpost.deploy
           const yamlPath = `./engine-private/conf/${deployId}/build/${env}/secret.yaml`;
           fs.writeFileSync(yamlPath, secretYaml, 'utf8');
         } else {
-          const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml'];
+          const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'pv-pvc.yaml'];
           for (const file of deploymentsFiles) {
             if (fs.existsSync(`./engine-private/conf/${deployId}/build/${env}/${file}`)) {
               fs.copyFileSync(
@@ -385,7 +407,7 @@ spec:
       // kubectl get deploy,sts,svc,configmap,secret -n default -o yaml --export > default.yaml
       const hostTest = options?.hostTest
         ? options.hostTest
-        : Object.keys(JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8')))[0];
+        : Object.keys(loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`))[0];
       const info = shellExec(`sudo kubectl get HTTPProxy/${hostTest} -n ${options.namespace} -o yaml`, {
         silent: true,
         stdout: true,
@@ -550,7 +572,7 @@ EOF`);
       if (!(options.versions && typeof options.versions === 'string')) options.versions = 'blue,green';
       if (!options.replicas) options.replicas = 1;
       if (options.sync)
-        getDataDeploy({
+        await getDataDeploy({
           buildSingleReplica: true,
         });
       if (options.buildManifest === true) await Underpost.deploy.buildManifest(deployList, env, options);
@@ -591,7 +613,7 @@ EOF`);
           continue;
         }
 
-        const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'));
+        const confServer = loadConfServerJson(`./engine-private/conf/${deployId}/conf.server.json`);
         const confVolume = fs.existsSync(`./engine-private/conf/${deployId}/conf.volume.json`)
           ? JSON.parse(fs.readFileSync(`./engine-private/conf/${deployId}/conf.volume.json`, 'utf8'))
           : [];
@@ -844,6 +866,7 @@ EOF`);
 ${Underpost.deploy.persistentVolumeFactory({
   hostPath: rootVolumeHostPath,
   pvcId,
+  namespace,
 })}
 EOF
 `);
@@ -914,15 +937,44 @@ EOF
      * @param {object} options - Options for the persistent volume and claim creation.
      * @param {string} options.hostPath - Host path for the persistent volume.
      * @param {string} options.pvcId - Persistent volume claim ID.
+     * @param {string} [options.namespace='default'] - Kubernetes namespace for the PVC claimRef.
      * @returns {string} - YAML configuration for the persistent volume and claim.
      * @memberof UnderpostDeploy
      */
-    persistentVolumeFactory({ hostPath, pvcId }) {
-      return fs
-        .readFileSync(`./manifests/pv-pvc-dd.yaml`, 'utf8')
-        .replace('/home/dd', hostPath)
-        .replace('pv-dd', pvcId.replace('pvc-', 'pv-'))
-        .replace('pvc-dd', pvcId);
+    persistentVolumeFactory({ hostPath, pvcId, namespace = 'default' }) {
+      const pvId = pvcId.replace(/^pvc-/, 'pv-');
+      return `apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: ${pvId}
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: ${pvcId}
+    namespace: ${namespace}
+  hostPath:
+    path: ${hostPath}
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ${pvcId}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: ${pvId}
+  resources:
+    requests:
+      storage: 5Gi`;
     },
 
     /**