@underpostnet/underpost 2.96.1 → 2.97.1

package/src/cli/cluster.js

@@ -352,7 +352,7 @@ EOF
         );
         shellExec(`sudo mkdir -p /mnt/data`);
         shellExec(`sudo chmod 777 /mnt/data`);
-        shellExec(`sudo chown -R root:root /mnt/data`);
+        shellExec(`sudo chown -R $(whoami):$(whoami) /mnt/data`);
         shellExec(`kubectl apply -k ${underpostRoot}/manifests/mysql -n ${options.namespace}`);
       }
       if (options.full === true || options.postgresql === true) {
@@ -487,8 +487,8 @@ EOF
       shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
 
       // Enable and start Docker and Kubelet services
-      shellExec(`sudo systemctl enable --now docker || true`); // Docker might not be needed for K3s
-      shellExec(`sudo systemctl enable --now kubelet || true`); // Kubelet might not be needed for K3s (K3s uses its own agent)
+      shellExec(`sudo systemctl enable --now docker`); // Docker might not be needed for K3s
+      shellExec(`sudo systemctl enable --now kubelet`); // Kubelet might not be needed for K3s (K3s uses its own agent)
 
       // Configure containerd for SystemdCgroup and explicitly disable SELinux
       // This is crucial for kubelet/k3s to interact correctly with containerd
@@ -496,9 +496,9 @@ EOF
       shellExec(`sudo sed -i -e "s/SystemdCgroup = false/SystemdCgroup = true/g" /etc/containerd/config.toml`);
       // Add a new line to disable SELinux for the runc runtime
       // shellExec(
-      //   `sudo sed -i '/SystemdCgroup = true/a       selinux_disabled = true' /etc/containerd/config.toml || true`,
+      //   `sudo sed -i '/SystemdCgroup = true/a       selinux_disabled = true' /etc/containerd/config.toml`,
       // );
-      shellExec(`sudo service docker restart || true`); // Restart docker after containerd config changes
+      shellExec(`sudo service docker restart`); // Restart docker after containerd config changes
       shellExec(`sudo systemctl enable --now containerd.service`);
       shellExec(`sudo systemctl restart containerd`); // Restart containerd to apply changes
 
@@ -533,8 +533,8 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
       shellExec(`${underpostRoot}/scripts/nat-iptables.sh`, { silent: true });
 
       // Disable firewalld (common cause of network issues in Kubernetes)
-      shellExec(`sudo systemctl stop firewalld || true`); // Stop if running
-      shellExec(`sudo systemctl disable firewalld || true`); // Disable from starting on boot
+      shellExec(`sudo systemctl stop firewalld`); // Stop if running
+      shellExec(`sudo systemctl disable firewalld`); // Disable from starting on boot
     },
 
     /**
@@ -563,7 +563,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
       } else if (clusterType === 'kind') {
         // For Kind, the kubeconfig is usually merged automatically or can be explicitly exported
         // This command ensures it's merged into the default kubeconfig
-        shellExec(`kind get kubeconfig > ~/.kube/config || true`);
+        shellExec(`kind get kubeconfig > ~/.kube/config`);
         shellExec(`sudo -E chown $(id -u):$(id -g) ~/.kube/config`);
       } else {
         logger.warn('No specific kubeconfig path defined for this cluster type, or it is managed automatically.');
@@ -622,7 +622,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
                 if (pv.spec.hostPath && pv.spec.hostPath.path) {
                   const hostPath = pv.spec.hostPath.path;
                   logger.info(`Removing data from host path for PV '${pv.metadata.name}': ${hostPath}`);
-                  shellExec(`sudo rm -rf ${hostPath}/* || true`);
+                  shellExec(`sudo rm -rf ${hostPath}/*`);
                 }
               }
             } else {
@@ -637,52 +637,52 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
         // Enable SELinux permissive mode and restore file contexts.
         logger.info('Phase 2/7: Stopping services and fixing SELinux...');
         logger.info('  -> Ensuring SELinux is in permissive mode...');
-        shellExec(`sudo setenforce 0 || true`);
-        shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config || true`);
+        shellExec(`sudo setenforce 0`);
+        shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
         logger.info('  -> Restoring SELinux contexts for container data directories...');
         // The 'restorecon' command corrects file system security contexts.
-        shellExec(`sudo restorecon -Rv /var/lib/containerd || true`);
-        shellExec(`sudo restorecon -Rv /var/lib/kubelet || true`);
+        shellExec(`sudo restorecon -Rv /var/lib/containerd`);
+        shellExec(`sudo restorecon -Rv /var/lib/kubelet`);
 
         logger.info('  -> Stopping kubelet, docker, and podman services...');
-        shellExec('sudo systemctl stop kubelet || true');
-        shellExec('sudo systemctl stop docker || true');
-        shellExec('sudo systemctl stop podman || true');
+        shellExec('sudo systemctl stop kubelet');
+        shellExec('sudo systemctl stop docker');
+        shellExec('sudo systemctl stop podman');
         // Safely unmount pod filesystems to avoid errors.
-        shellExec('sudo umount -f /var/lib/kubelet/pods/*/* || true');
+        shellExec('sudo umount -f /var/lib/kubelet/pods/*/*');
 
         // Phase 3: Execute official uninstallation commands
         logger.info('Phase 3/7: Executing official reset and uninstallation commands...');
         logger.info('  -> Executing kubeadm reset...');
-        shellExec('sudo kubeadm reset --force || true');
+        shellExec('sudo kubeadm reset --force');
         logger.info('  -> Executing K3s uninstallation script if it exists...');
-        shellExec('sudo /usr/local/bin/k3s-uninstall.sh || true');
+        shellExec('sudo /usr/local/bin/k3s-uninstall.sh');
         logger.info('  -> Deleting Kind clusters...');
-        shellExec('kind get clusters | xargs -r -t -n1 kind delete cluster || true');
+        shellExec('kind get clusters | xargs -r -t -n1 kind delete cluster');
 
         // Phase 4: File system cleanup
         logger.info('Phase 4/7: Cleaning up remaining file system artifacts...');
         // Remove any leftover configurations and data.
-        shellExec('sudo rm -rf /etc/kubernetes/* || true');
-        shellExec('sudo rm -rf /etc/cni/net.d/* || true');
-        shellExec('sudo rm -rf /var/lib/kubelet/* || true');
-        shellExec('sudo rm -rf /var/lib/cni/* || true');
-        shellExec('sudo rm -rf /var/lib/docker/* || true');
-        shellExec('sudo rm -rf /var/lib/containerd/* || true');
-        shellExec('sudo rm -rf /var/lib/containers/storage/* || true');
+        shellExec('sudo rm -rf /etc/kubernetes/*');
+        shellExec('sudo rm -rf /etc/cni/net.d/*');
+        shellExec('sudo rm -rf /var/lib/kubelet/*');
+        shellExec('sudo rm -rf /var/lib/cni/*');
+        shellExec('sudo rm -rf /var/lib/docker/*');
+        shellExec('sudo rm -rf /var/lib/containerd/*');
+        shellExec('sudo rm -rf /var/lib/containers/storage/*');
         // Clean up the current user's kubeconfig.
-        shellExec('rm -rf $HOME/.kube || true');
+        shellExec('rm -rf $HOME/.kube');
 
         // Phase 5: Host network cleanup
         logger.info('Phase 5/7: Cleaning up host network configurations...');
         // Remove iptables rules and CNI network interfaces.
-        shellExec('sudo iptables -F || true');
-        shellExec('sudo iptables -t nat -F || true');
+        shellExec('sudo iptables -F');
+        shellExec('sudo iptables -t nat -F');
         // Restore iptables rules
         shellExec(`chmod +x ${options.underpostRoot}/scripts/nat-iptables.sh`);
         shellExec(`${options.underpostRoot}/scripts/nat-iptables.sh`, { silent: true });
-        shellExec('sudo ip link del cni0 || true');
-        shellExec('sudo ip link del flannel.1 || true');
+        shellExec('sudo ip link del cni0');
+        shellExec('sudo ip link del flannel.1');
 
         logger.info('Phase 6/7: Clean up images');
         shellExec(`podman rmi $(podman images -qa) --force`);
@@ -792,51 +792,49 @@ EOF`);
 
       // Remove Kind
       console.log('Removing Kind...');
-      shellExec(`sudo rm -f /bin/kind || true`);
+      shellExec(`sudo rm -f /bin/kind`);
 
       // Remove Helm
       console.log('Removing Helm...');
-      shellExec(`sudo rm -f /usr/local/bin/helm || true`);
-      shellExec(`sudo rm -f /usr/local/bin/helm.sh || true`); // clean up the install script if it exists
+      shellExec(`sudo rm -f /usr/local/bin/helm`);
+      shellExec(`sudo rm -f /usr/local/bin/helm.sh`); // clean up the install script if it exists
 
       // Remove Docker and its dependencies
       console.log('Removing Docker, containerd, and related packages...');
-      shellExec(
-        `sudo dnf -y remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin || true`,
-      );
+      shellExec(`sudo dnf -y remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
 
       // Remove Podman
       console.log('Removing Podman...');
-      shellExec(`sudo dnf -y remove podman || true`);
+      shellExec(`sudo dnf -y remove podman`);
 
       // Remove Kubeadm, Kubelet, and Kubectl
       console.log('Removing Kubernetes tools...');
-      shellExec(`sudo yum remove -y kubelet kubeadm kubectl || true`);
+      shellExec(`sudo yum remove -y kubelet kubeadm kubectl`);
 
       // Remove Kubernetes repo file
       console.log('Removing Kubernetes repository configuration...');
-      shellExec(`sudo rm -f /etc/yum.repos.d/kubernetes.repo || true`);
+      shellExec(`sudo rm -f /etc/yum.repos.d/kubernetes.repo`);
 
       // Clean up Kubeadm config and data directories
       console.log('Cleaning up Kubernetes configuration directories...');
-      shellExec(`sudo rm -rf /etc/kubernetes/pki || true`);
-      shellExec(`sudo rm -rf ~/.kube || true`);
+      shellExec(`sudo rm -rf /etc/kubernetes/pki`);
+      shellExec(`sudo rm -rf ~/.kube`);
 
       // Stop and disable services
       console.log('Stopping and disabling services...');
-      shellExec(`sudo systemctl stop docker.service || true`);
-      shellExec(`sudo systemctl disable docker.service || true`);
-      shellExec(`sudo systemctl stop containerd.service || true`);
-      shellExec(`sudo systemctl disable containerd.service || true`);
-      shellExec(`sudo systemctl stop kubelet.service || true`);
-      shellExec(`sudo systemctl disable kubelet.service || true`);
+      shellExec(`sudo systemctl stop docker.service`);
+      shellExec(`sudo systemctl disable docker.service`);
+      shellExec(`sudo systemctl stop containerd.service`);
+      shellExec(`sudo systemctl disable containerd.service`);
+      shellExec(`sudo systemctl stop kubelet.service`);
+      shellExec(`sudo systemctl disable kubelet.service`);
 
       // Clean up config files
       console.log('Removing host configuration files...');
-      shellExec(`sudo rm -f /etc/containerd/config.toml || true`);
-      shellExec(`sudo rm -f /etc/sysctl.d/k8s.conf || true`);
-      shellExec(`sudo rm -f /etc/sysctl.d/99-k8s-ipforward.conf || true`);
-      shellExec(`sudo rm -f /etc/sysctl.d/99-k8s.conf || true`);
+      shellExec(`sudo rm -f /etc/containerd/config.toml`);
+      shellExec(`sudo rm -f /etc/sysctl.d/k8s.conf`);
+      shellExec(`sudo rm -f /etc/sysctl.d/99-k8s-ipforward.conf`);
+      shellExec(`sudo rm -f /etc/sysctl.d/99-k8s.conf`);
 
       // Restore SELinux to enforcing
       console.log('Restoring SELinux to enforcing mode...');

package/src/cli/db.js

@@ -725,8 +725,14 @@ class UnderpostDB {
      * @param {string} [options.paths=''] - Comma-separated list of paths to filter databases
      * @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 {string} [options.primaryPodEnsure=''] - Pod name to ensure MongoDB primary pod is running
      * @param {boolean} [options.stats=false] - Whether to display database statistics
      * @param {number} [options.macroRollbackExport=1] - Number of commits to rollback in macro export
+     * @param {boolean} [options.forceClone=false] - Whether to force re-clone Git repository
+     * @param {boolean} [options.dev=false] - Development mode flag
+     * @param {boolean} [options.k3s=false] - k3s cluster flag
+     * @param {boolean} [options.kubeadm=false] - kubeadm cluster flag
+     * @param {boolean} [options.kind=false] - kind cluster flag
      * @returns {Promise<void>} Resolves when operation is complete
      * @memberof UnderpostDB
      */
@@ -746,9 +752,14 @@ class UnderpostDB {
         paths: '',
         allPods: false,
         primaryPod: false,
+        primaryPodEnsure: '',
         stats: false,
         macroRollbackExport: 1,
         forceClone: false,
+        dev: false,
+        k3s: false,
+        kubeadm: false,
+        kind: false,
       },
     ) {
       const newBackupTimestamp = new Date().getTime();
@@ -763,6 +774,17 @@ class UnderpostDB {
         export: options.export,
       });
 
+      if (options.primaryPodEnsure) {
+        const primaryPodName = UnderpostDB.API.getMongoPrimaryPodName({ namespace, podName: options.primaryPodEnsure });
+        if (!primaryPodName) {
+          const baseCommand = options.dev ? 'node bin' : 'underpost';
+          const baseClusterCommand = options.dev ? ' --dev' : '';
+          let clusterFlag = options.k3s ? ' --k3s' : options.kubeadm ? ' --kubeadm' : '';
+          shellExec(`${baseCommand} cluster${baseClusterCommand}${clusterFlag} --mongodb`);
+        }
+        return;
+      }
+
       // Track processed repositories to avoid duplicate Git operations
       const processedRepos = new Set();
       // Track processed host+path combinations to avoid duplicates

package/src/cli/deploy.js

@@ -106,12 +106,13 @@ class UnderpostDeploy {
      * @memberof UnderpostDeploy
      */
     deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas, image, namespace, volumes, cmd }) {
+      const baseCommand = env === 'development' ? 'node bin' : 'underpost';
       if (!cmd)
         cmd = [
           `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 ${deployId} ${env}`,
+          `${baseCommand} secret underpost --create-from-file /etc/config/.env.${env}`,
+          `${baseCommand} start --build --run ${deployId} ${env}`,
         ];
       const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
       if (!volumes)
@@ -221,6 +222,7 @@ ${UnderpostDeploy.API.deploymentYamlPartsFactory({
   replicas,
   image,
   namespace: options.namespace,
+  cmd: options.cmd ? options.cmd.split(',').map((c) => c.trim()) : undefined,
 }).replace('{{ports}}', buildKindPorts(fromPort, toPort))}
 `;
         }
@@ -389,6 +391,7 @@ spec:
      * @param {string} [options.namespace] - Kubernetes namespace for the deployment.
      * @param {string} [options.kindType] - Type of Kubernetes resource to retrieve information for.
      * @param {number} [options.port] - Port number for exposing the deployment.
+     * @param {string} [options.cmd] - Custom initialization command for deploymentYamlPartsFactory (comma-separated commands).
      * @returns {Promise<void>} - Promise that resolves when the deployment process is complete.
      * @memberof UnderpostDeploy
      */
@@ -420,6 +423,7 @@ spec:
         namespace: '',
         kindType: '',
         port: 0,
+        cmd: '',
       },
     ) {
       const namespace = options.namespace ? options.namespace : 'default';
@@ -757,7 +761,7 @@ EOF`);
         // shellExec(`docker cp ${volume.volumeMountPath} kind-worker:${rootVolumeHostPath}`);
         shellExec(`tar -C ${volume.volumeMountPath} -c . | docker cp - kind-worker:${rootVolumeHostPath}`);
         shellExec(
-          `docker exec -i kind-worker bash -c "chown -R 1000:1000 ${rootVolumeHostPath} || true; chmod -R 755 ${rootVolumeHostPath}"`,
+          `docker exec -i kind-worker bash -c "chown -R 1000:1000 ${rootVolumeHostPath}; chmod -R 755 ${rootVolumeHostPath}"`,
         );
       }
       shellExec(`kubectl delete pvc ${pvcId} -n ${namespace} --ignore-not-found`);

package/src/cli/image.js

@@ -119,6 +119,7 @@ class UnderpostImage {
       } = options;
       if (!path) path = '.';
       if (!imageName) imageName = `rockylinux9-underpost:${Underpost.version}`;
+      if (!imagePath) imagePath = '.';
       if (!version) version = 'latest';
       version = imageName && imageName.match(':') ? '' : `:${version}`;
       const podManImg = `localhost/${imageName}${version}`;

package/src/cli/index.js

@@ -10,7 +10,6 @@ import UnderpostRun from './run.js';
 import Dns from '../server/dns.js';
 import UnderpostStatic from './static.js';
 
-// Load environment variables from .env file
 const underpostRootPath = getUnderpostRootPath();
 fs.existsSync(`${underpostRootPath}/.env`)
   ? dotenv.config({ path: `${underpostRootPath}/.env`, override: true })
@@ -18,14 +17,12 @@ fs.existsSync(`${underpostRootPath}/.env`)
 
 const program = new Command();
 
-// Set up the main program information
 program.name('underpost').description(`underpost ci/cd cli ${Underpost.version}`).version(Underpost.version);
 
-// 'new' command: Create a new project
 program
   .command('new')
   .argument('[app-name]', 'The name of the new project.')
-  .option('--deploy-id <deploy-id>', 'Crete deploy ID conf env files')
+  .option('--deploy-id <deploy-id>', 'Create deploy ID conf env files')
   .option('--sub-conf <sub-conf>', 'Create sub conf env files')
   .option('--cluster', 'Create deploy ID cluster files and sync to current cluster')
   .option('--build-repos', 'Create deploy ID repositories')
@@ -39,7 +36,6 @@ program
   .description('Initializes a new Underpost project, service, or configuration.')
   .action(Underpost.repo.new);
 
-// 'start' command: Start application servers, build pipelines, or services
 program
   .command('start')
   .argument('<deploy-id>', 'The unique identifier for the deployment configuration.')
@@ -49,10 +45,10 @@ program
   )
   .option('--run', 'Starts application servers and monitors their health.')
   .option('--build', 'Triggers the client-side application build process.')
+  .option('--underpost-quickly-install', 'Uses Underpost Quickly Install for dependency installation.')
   .action(Underpost.start.callback)
   .description('Initiates application servers, build pipelines, or other defined services based on the deployment ID.');
 
-// 'clone' command: Clone a GitHub repository
 program
   .command('clone')
   .argument(`<uri>`, 'The URI of the GitHub repository (e.g., "username/repository").')
@@ -61,7 +57,6 @@ program
   .description('Clones a specified GitHub repository into the current directory.')
   .action(Underpost.repo.clone);
 
-// 'pull' command: Pull updates from a GitHub repository
 program
   .command('pull')
   .argument('<path>', 'The absolute or relative directory path where the repository is located.')
@@ -70,7 +65,6 @@ program
   .option('-g8', 'Uses the g8 repository extension for pulling.')
   .action(Underpost.repo.pull);
 
-// 'cmt' command: Commit changes to a GitHub repository
 program
   .command('cmt')
   .argument('[path]', 'The absolute or relative directory path of the repository.')
@@ -92,7 +86,6 @@ program
   .description('Manages commits to a GitHub repository, supporting various commit types and options.')
   .action(Underpost.repo.commit);
 
-// 'push' command: Push changes to a GitHub repository
 program
   .command('push')
   .argument('<path>', 'The absolute or relative directory path of the repository.')
@@ -102,7 +95,6 @@ program
   .description('Pushes committed changes from a local repository to a remote GitHub repository.')
   .action(Underpost.repo.push);
 
-// 'env' command: Manage environment variables
 program
   .command('env')
   .argument(
@@ -122,7 +114,6 @@ program
     loadConf(deployId, subConf);
   });
 
-// 'static' command: Manage static configurations
 program
   .command('static')
   .option('--page <ssr-component-path>', 'Build custom static pages.')
@@ -139,21 +130,17 @@ program
   .option('--locale <locale>', 'Page locale (default: en-US).')
   .option('--site-name <name>', 'Site name for Open Graph.')
 
-  // Script and style options
   .option('--head-scripts <paths>', 'Comma-separated paths to scripts for head section.')
   .option('--body-scripts <paths>', 'Comma-separated paths to scripts for body section.')
   .option('--styles <paths>', 'Comma-separated paths to stylesheets.')
 
-  // Icon options
   .option('--favicon <path>', 'Favicon path.')
   .option('--apple-touch-icon <path>', 'Apple touch icon path.')
   .option('--manifest <path>', 'Web manifest path.')
 
-  // Component options
   .option('--head-components <paths>', 'Comma-separated SSR head component paths.')
   .option('--body-components <paths>', 'Comma-separated SSR body component paths.')
 
-  // Build options
   .option('--deploy-id <deploy-id>', 'Build static assets for a specific deployment ID.')
   .option('--build', 'Triggers the static build process for the specified deployment ID.')
   .option('--build-host <build-host>', 'Sets a custom build host for static documents or assets.')
@@ -162,11 +149,9 @@ program
   .option('--minify', 'Minify HTML output (default: true for production).')
   .option('--no-minify', 'Disable HTML minification.')
 
-  // Config file options
   .option('--config-file <path>', 'Path to JSON configuration file.')
   .option('--generate-config [path]', 'Generate a template configuration file.')
 
-  // Other options
   .option('--lang <lang>', 'HTML lang attribute (default: en).')
   .option('--dir <dir>', 'HTML dir attribute (default: ltr).')
   .option('--dev', 'Sets the development cli context')
@@ -174,7 +159,6 @@ program
   .description(`Manages static build of page, bundles, and documentation with comprehensive customization options.`)
   .action(UnderpostStatic.API.callback);
 
-// 'config' command: Manage Underpost configurations
 program
   .command('config')
   .argument('operator', `The configuration operation to perform. Options: ${Object.keys(Underpost.env).join(', ')}.`)
@@ -185,7 +169,6 @@ program
   .description(`Manages Underpost configurations using various operators.`)
   .action((...args) => Underpost.env[args[0]](args[1], args[2], args[3]));
 
-// 'root' command: Get npm root path
 program
   .command('root')
   .description('Displays the root path of the npm installation.')
@@ -194,6 +177,7 @@ program
 program
   .command('ip')
   .argument('[ips]', 'Optional args comma-separated list of IP to process.')
+  .option('--dhcp', 'Fetches and displays the current Dynamic Host Configuration Protocol server IP address.')
   .option('--copy', 'Copies the IP addresses to the clipboard.')
   .option('--ban-ingress-add', 'Adds IP addresses to banned ingress list.')
   .option('--ban-ingress-remove', 'Removes IP addresses from banned ingress list.')
@@ -208,7 +192,6 @@ program
   .description('Displays the current public machine IP addresses.')
   .action(Dns.ipDispatcher);
 
-// 'cluster' command: Manage Kubernetes clusters
 program
   .command('cluster')
   .argument('[pod-name]', 'Optional: Filters information by a specific pod name.')
@@ -257,7 +240,6 @@ program
   .action(Underpost.cluster.init)
   .description('Manages Kubernetes clusters, defaulting to Kind cluster initialization.');
 
-// 'deploy' command: Manage deployments
 program
   .command('deploy')
   .argument('[deploy-list]', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
@@ -295,10 +277,10 @@ program
   .option('--namespace <namespace>', 'Kubernetes namespace for deployment operations (defaults to "default").')
   .option('--kind-type <kind-type>', 'Specifies the Kind cluster type for deployment operations.')
   .option('--port <port>', 'Sets up port forwarding from local to remote ports.')
+  .option('--cmd <cmd>', 'Custom initialization command for deployment (comma-separated commands).')
   .description('Manages application deployments, defaulting to deploying development pods.')
   .action(Underpost.deploy.callback);
 
-// 'secret' command: Manage secrets
 program
   .command('secret')
   .argument('<platform>', `The secret management platform. Options: ${Object.keys(Underpost.secret).join(', ')}.`)
@@ -312,7 +294,6 @@ program
     if (args[1].init) return Underpost.secret[args[0]].init();
   });
 
-// 'image'
 program
   .command('image')
   .option(
@@ -348,7 +329,6 @@ program
       Underpost.image.pullDockerHubImage({ ...options, dockerhubImage: options.pullDockerhub });
   });
 
-// 'install' command: Fast import npm dependencies
 program
   .command('install')
   .description('Quickly imports Underpost npm dependencies by copying them.')
@@ -356,10 +336,9 @@ program
     fs.copySync(`${underpostRootPath}/node_modules`, './node_modules');
   });
 
-// 'db' command: Manage databases
 program
   .command('db')
-  .argument('<deploy-list>', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
+  .argument('[deploy-list]', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
   .option('--import', 'Imports container backups from specified repositories.')
   .option('--export', 'Exports container backups to specified repositories.')
   .option(
@@ -368,6 +347,7 @@ program
   )
   .option('--all-pods', 'Target all matching pods instead of just the first one.')
   .option('--primary-pod', 'Automatically detect and use MongoDB primary pod (MongoDB only).')
+  .option('--primary-pod-ensure <pod-name>', 'Ensure setup of MongoDB replica set primary pod before operations.')
   .option('--stats', 'Display database statistics (collection/table names with document/row counts).')
   .option('--collections <collections>', 'Comma-separated list of database collections to operate on.')
   .option('--out-path <out-path>', 'Specifies a custom output path for backups.')
@@ -382,6 +362,10 @@ program
     '--macro-rollback-export <n-commits-reset>',
     'Exports a macro rollback script that reverts the last n commits (Git integration required).',
   )
+  .option('--dev', 'Sets the development cli context')
+  .option('--kubeadm', 'Enables the kubeadm context for database operations.')
+  .option('--kind', 'Enables the kind context for database operations.')
+  .option('--k3s', 'Enables the k3s context for database operations.')
   .description(
     'Manages database operations with support for MariaDB and MongoDB, including import/export, multi-pod targeting, and Git integration.',
   )
@@ -401,7 +385,6 @@ program
   .description('Manages cluster metadata operations, including import and export.')
   .action(Underpost.db.clusterMetadataBackupCallback);
 
-// 'script' command: Execute scripts
 program
   .command('script')
   .argument('operator', `The script operation to perform. Options: ${Object.keys(Underpost.script).join(', ')}.`)
@@ -416,7 +399,6 @@ program
   )
   .action((...args) => Underpost.script[args[0]](args[1], args[2], args[3]));
 
-// 'cron' command: Manage cron jobs
 program
   .command('cron')
   .argument('[deploy-list]', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
@@ -432,7 +414,6 @@ program
   .description('Manages cron jobs, including initialization, execution, and configuration updates.')
   .action(Underpost.cron.callback);
 
-// 'fs' command: File storage management
 program
   .command('fs')
   .argument('[path]', 'The absolute or relative directory path for file operations.')
@@ -446,7 +427,6 @@ program
   .description('Manages file storage, defaulting to file upload operations.')
   .action(Underpost.fs.callback);
 
-// 'test' command: Manage tests
 program
   .command('test')
   .argument('[deploy-list]', 'A comma-separated list of deployment IDs (e.g., "default-a,default-b").')
@@ -459,7 +439,6 @@ program
   .option('--kind-type <kind-type>', 'Optional: Specifies the Kind cluster type for tests.')
   .action(Underpost.test.callback);
 
-// 'monitor' command: Monitor health server
 program
   .command('monitor')
   .argument('<deploy-id>', 'The deployment configuration ID to monitor.')
@@ -477,7 +456,6 @@ program
   .description('Manages health server monitoring for specified deployments.')
   .action(Underpost.monitor.callback);
 
-// 'ssh' command: SSH management
 program
   .command('ssh')
   .option('--deploy-id <deploy-id>', 'Sets deploy id context for ssh operations.')
@@ -503,12 +481,11 @@ program
   .option('--copy', 'Copies the connection URI to clipboard.')
   .action(Underpost.ssh.callback);
 
-// 'run' command: Run a script
 program
   .command('run')
   .argument('<runner-id>', `The runner ID to run. Options: ${Object.keys(UnderpostRun.RUNNERS).join(', ')}.`)
   .argument('[path]', 'The input value, identifier, or path for the operation.')
-  .option('--command <command-array>', 'Array of commands to run.')
+  .option('--cmd <command-list>', 'Comma-separated list of commands to execute.')
   .option('--args <args-array>', 'Array of arguments to pass to the command.')
   .option('--dev', 'Sets the development context environment for the script.')
   .option('--build', 'Set builder context runner')
@@ -565,10 +542,10 @@ program
   .option('--user <user>', 'Sets user context for the runner execution.')
   .option('--hosts <hosts>', 'Comma-separated list of hosts for the runner execution.')
   .option('--instance-id <instance-id>', 'Sets instance id context for the runner execution.')
+  .option('--pid <process-id>', 'Sets process id context for the runner execution.')
   .description('Runs specified scripts using various runners.')
   .action(UnderpostRun.API.callback);
 
-// 'lxd' command: LXD management
 program
   .command('lxd')
   .option('--init', 'Initializes LXD on the current machine.')
@@ -604,13 +581,20 @@ program
   .description('Manages LXD containers and virtual machines.')
   .action(UnderpostLxd.API.callback);
 
-// 'baremetal' command: Baremetal server management
 program
-  .command('baremetal [workflow-id] [hostname] [ip-address]')
+  .command('baremetal [workflow-id] [ip-address] [hostname] [ip-file-server] [ip-config] [netmask] [dns-server]')
   .option('--control-server-install', 'Installs the baremetal control server.')
   .option('--control-server-uninstall', 'Uninstalls the baremetal control server.')
+  .option('--control-server-restart', 'Restarts the baremetal control server.')
   .option('--control-server-db-install', 'Installs up the database for the baremetal control server.')
   .option('--control-server-db-uninstall', 'Uninstalls the database for the baremetal control server.')
+  .option('--create-machine', 'Creates a new baremetal machine entry in the database.')
+  .option(
+    '--mac <mac>',
+    'Specifies the MAC address for baremetal machine operations. Use "random" for random MAC, "hardware" to use device\'s actual MAC (no spoofing), or specify a MAC address.',
+  )
+  .option('--ipxe', 'Chainloads iPXE to normalize identity before commissioning.')
+  .option('--ipxe-rebuild', 'Forces rebuild of iPXE binary with embedded boot script.')
   .option('--install-packer', 'Installs Packer CLI.')
   .option(
     '--packer-maas-image-template <template-path>',
@@ -629,12 +613,31 @@ program
     '--packer-maas-image-cached',
     'Continue last build without removing artifacts (used with --packer-maas-image-build).',
   )
+  .option('--remove-machines <system-ids>', 'Removes baremetal machines by comma-separated system IDs, or use "all"')
+  .option('--clear-discovered', 'Clears all discovered baremetal machines from the database.')
   .option('--commission', 'Init workflow for commissioning a physical machine.')
+  .option(
+    '--bootstrap-http-server-path <path>',
+    'Sets a custom bootstrap HTTP server path for baremetal commissioning.',
+  )
+  .option(
+    '--bootstrap-http-server-port <port>',
+    'Sets a custom bootstrap HTTP server port for baremetal commissioning.',
+  )
+  .option('--iso-url <url>', 'Uses a custom ISO URL for baremetal machine commissioning.')
   .option('--nfs-build', 'Builds an NFS root filesystem for a workflow id config architecture using QEMU emulation.')
   .option('--nfs-mount', 'Mounts the NFS root filesystem for a workflow id config architecture.')
   .option('--nfs-unmount', 'Unmounts the NFS root filesystem for a workflow id config architecture.')
+  .option('--nfs-build-server', 'Builds the NFS server for a workflow id config architecture.')
   .option('--nfs-sh', 'Copies QEMU emulation root entrypoint shell command to the clipboard.')
+  .option('--cloud-init', 'Sets the kernel parameters and sets the necessary seed users on the HTTP server.')
   .option('--cloud-init-update', 'Updates cloud init for a workflow id config architecture.')
+  .option('--ubuntu-tools-build', 'Builds ubuntu tools for chroot environment.')
+  .option('--ubuntu-tools-test', 'Tests ubuntu tools in chroot environment.')
+  .option('--rocky-tools-build', 'Builds rocky linux tools for chroot environment.')
+  .option('--rocky-tools-test', 'Tests rocky linux tools in chroot environment.')
+  .option('--bootcmd <bootcmd-list>', 'Comma-separated list of boot commands to execute.')
+  .option('--runcmd <runcmd-list>', 'Comma-separated list of run commands to execute.')
   .option('--logs <log-id>', 'Displays logs for log id: dhcp, cloud, machine, cloud-config.')
   .option('--dev', 'Sets the development context environment for baremetal operations.')
   .option('--ls', 'Lists available boot resources and machines.')