underpost 2.89.35 → 2.89.44

package/src/cli/index.js

@@ -7,6 +7,8 @@ import { commitData } from '../client/components/core/CommonJs.js';
 import UnderpostLxd from './lxd.js';
 import UnderpostBaremetal from './baremetal.js';
 import UnderpostRun from './run.js';
+import Dns from '../server/dns.js';
+import { pbcopy } from '../server/process.js';
 
 // Load environment variables from .env file
 const underpostRootPath = getUnderpostRootPath();
@@ -129,6 +131,16 @@ program
   .description('Displays the root path of the npm installation.')
   .action(() => console.log(getNpmRootPath()));
 
+program
+  .command('ip')
+  .option('--copy', 'Copies the IP addresses to the clipboard.')
+  .description('Displays the current public machine IP addresses.')
+  .action(async (options) => {
+    const ip = await Dns.getPublicIp();
+    if (options.copy) return pbcopy(ip);
+    return console.log(ip);
+  });
+
 // 'cluster' command: Manage Kubernetes clusters
 program
   .command('cluster')
@@ -146,7 +158,10 @@ program
   .option('--dedicated-gpu', 'Initializes the cluster with dedicated GPU base resources and environment settings.')
   .option('--info', 'Retrieves information about all deployed Kubernetes objects.')
   .option('--full', 'Initializes the cluster with all available statefulsets and services.')
-  .option('--ns-use <ns-name>', 'Switches the current Kubernetes context to the specified namespace.')
+  .option(
+    '--ns-use <ns-name>',
+    "Switches the current Kubernetes context to the specified namespace (creates if it doesn't exist).",
+  )
   .option('--kubeadm', 'Initializes the cluster using kubeadm for control plane management.')
   .option('--grafana', 'Initializes the cluster with a Grafana deployment.')
   .option(
@@ -166,6 +181,7 @@ program
   .option('--k3s', 'Initializes the cluster using K3s (Lightweight Kubernetes).')
   .option('--hosts <hosts>', 'A comma-separated list of cluster hostnames or IP addresses.')
   .option('--remove-volume-host-paths', 'Removes specified volume host paths after execution.')
+  .option('--namespace <namespace>', 'Kubernetes namespace for cluster operations (defaults to "default").')
   .action(Underpost.cluster.init)
   .description('Manages Kubernetes clusters, defaulting to Kind cluster initialization.');
 
@@ -205,6 +221,7 @@ program
   .option('--etc-hosts', 'Enables the etc-hosts context for deployment operations.')
   .option('--restore-hosts', 'Restores default `/etc/hosts` entries.')
   .option('--disable-update-underpost-config', 'Disables updates to Underpost configuration during deployment.')
+  .option('--namespace <namespace>', 'Kubernetes namespace for deployment operations (defaults to "default").')
   .description('Manages application deployments, defaulting to deploying development pods.')
   .action(Underpost.deploy.callback);
 
@@ -402,6 +419,10 @@ program
   .option('--runtime-class-name <name>', 'Sets the runtime class name for the job in deploy-job.')
   .option('--image-pull-policy <policy>', 'Sets the image pull policy for the job in deploy-job.')
   .option('--api-version <version>', 'Sets the API version for the job manifest in deploy-job.')
+  .option(
+    '--labels <labels>',
+    'Optional: Specifies a comma-separated list of key-value pairs for labels (e.g., "app=my-app,env=prod").',
+  )
   .option('--claim-name <name>', 'Optional: Specifies the claim name for volume mounting in deploy-job.')
   .option('--kind <kind-type>', 'Specifies the kind of Kubernetes resource (e.g., Job, Deployment) for deploy-job.')
   .option('--kubeadm', 'Flag to indicate Kubeadm cluster type context')

package/src/cli/monitor.js

@@ -95,12 +95,13 @@ class UnderpostMonitor {
         if (traffic === 'blue') traffic = 'green';
         else traffic = 'blue';
         UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, traffic);
+        const namespace = options.namespace || 'default';
         shellExec(
           `node bin deploy --info-router --build-manifest --traffic ${traffic} --replicas ${
             options.replicas ? options.replicas : 1
-          } ${deployId} ${env}`,
+          } --namespace ${namespace} ${deployId} ${env}`,
         );
-        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml`);
+        shellExec(`sudo kubectl apply -f ./engine-private/conf/${deployId}/build/${env}/proxy.yaml -n ${namespace}`);
       };
 
       const monitor = async (reject) => {
@@ -152,12 +153,15 @@ class UnderpostMonitor {
                           fs.readFileSync(`./engine-private/conf/${deployId}/conf.server.json`, 'utf8'),
                         );
 
-                        UnderpostDeploy.API.configMap(env);
+                        const namespace = options.namespace || 'default';
+                        UnderpostDeploy.API.configMap(env, namespace);
 
                         for (const host of Object.keys(confServer)) {
-                          shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+                          shellExec(`sudo kubectl delete HTTPProxy ${host} -n ${namespace} --ignore-not-found`);
                         }
-                        shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic}`);
+                        shellExec(
+                          `sudo kubectl rollout restart deployment/${deployId}-${env}-${traffic} -n ${namespace}`,
+                        );
 
                         switchTraffic();
                       }

package/src/cli/repository.js

@@ -179,7 +179,7 @@ class UnderpostRepository {
         return;
       }
       if (options.info) return logger.info('', commitData);
-      const _message = `${commitType}${subModule ? `(${subModule})` : ''}${process.argv.includes('!') ? '!' : ''}: ${
+      const _message = `${commitType}${subModule ? `(${subModule})` : ''}: ${
         commitData[commitType].emoji
       } ${message ? message : commitData[commitType].description}`;
       if (options.copy) return pbcopy(_message);

package/src/cli/run.js

@@ -81,7 +81,7 @@ class UnderpostRun {
     volumeMountPath: '',
     imageName: '',
     containerName: '',
-    namespace: '',
+    namespace: 'default',
     build: false,
     replicas: 1,
     k3s: false,
@@ -209,10 +209,10 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'tf-gpu-test': (path, options = UnderpostRun.DEFAULT_OPTION) => {
-      const { underpostRoot } = options;
-      shellExec(`kubectl delete configmap tf-gpu-test-script`);
-      shellExec(`kubectl delete pod tf-gpu-test-pod`);
-      shellExec(`kubectl apply -f ${underpostRoot}/manifests/deployment/tensorflow/tf-gpu-test.yaml`);
+      const { underpostRoot, namespace } = options;
+      shellExec(`kubectl delete configmap tf-gpu-test-script -n ${namespace} --ignore-not-found`);
+      shellExec(`kubectl delete pod tf-gpu-test-pod -n ${namespace} --ignore-not-found`);
+      shellExec(`kubectl apply -f ${underpostRoot}/manifests/deployment/tensorflow/tf-gpu-test.yaml -n ${namespace}`);
     },
     /**
      * @method dev-cluster
@@ -340,9 +340,10 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'cluster-build': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const nodeOptions = options.nodeName ? ` --node-name ${options.nodeName}` : '';
       shellExec(`node bin run clean`);
-      shellExec(`node bin run --dev sync-replica template-deploy`);
-      shellExec(`node bin run sync-replica template-deploy`);
+      shellExec(`node bin run --dev sync-replica template-deploy${nodeOptions}`);
+      shellExec(`node bin run sync-replica template-deploy${nodeOptions}`);
       shellExec(`node bin env clean`);
       for (const deployId of fs.readFileSync('./engine-private/deploy/dd.router', 'utf8').split(','))
         shellExec(`node bin/deploy update-default-conf ${deployId.trim()}`);
@@ -509,11 +510,13 @@ class UnderpostRun {
       shellExec(
         `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
           replicas ? replicas : 1
-        } --node ${node}${image ? ` --image ${image}` : ''}${versions ? ` --versions ${versions}` : ''} dd ${env}`,
+        } --node ${node}${image ? ` --image ${image}` : ''}${versions ? ` --versions ${versions}` : ''}${options.namespace ? ` --namespace ${options.namespace}` : ''} dd ${env}`,
       );
 
       if (isDeployRunnerContext(path, options)) {
-        shellExec(`${baseCommand} deploy --kubeadm --disable-update-proxy ${deployId} ${env} --versions ${versions}`);
+        shellExec(
+          `${baseCommand} deploy --kubeadm --disable-update-proxy ${deployId} ${env} --versions ${versions}${options.namespace ? ` --namespace ${options.namespace}` : ''}`,
+        );
         if (!targetTraffic) targetTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
         await UnderpostDeploy.API.monitorReadyRunner(deployId, env, targetTraffic);
         UnderpostDeploy.API.switchTraffic(deployId, env, targetTraffic);
@@ -618,7 +621,7 @@ class UnderpostRun {
           `docker exec -i kind-worker bash -c "chown -R 1000:1000 ${volumeHostPath} || true; chmod -R 755 ${volumeHostPath}"`,
         );
       } else {
-        shellExec(`kubectl apply -f ${options.underpostRoot}/manifests/pv-pvc-dd.yaml`);
+        shellExec(`kubectl apply -f ${options.underpostRoot}/manifests/pv-pvc-dd.yaml -n ${options.namespace}`);
       }
 
       if (!currentImage)
@@ -681,7 +684,7 @@ class UnderpostRun {
           switch (path) {
             case 'tf-vae-test':
               {
-                const nameSpace = 'default';
+                const nameSpace = options.namespace || 'default';
                 const podName = path;
                 const basePath = '/home/dd';
                 const scriptPath = '/site/en/tutorials/generative/cvae.py';
@@ -763,8 +766,8 @@ class UnderpostRun {
         // For kubeadm/k3s, ensure it's available for containerd
         shellExec(`sudo crictl pull ${image}`);
 
-      shellExec(`kubectl delete deployment adminer`);
-      shellExec(`kubectl apply -k ${underpostRoot}/manifests/deployment/adminer/.`);
+      shellExec(`kubectl delete deployment adminer -n ${options.namespace} --ignore-not-found`);
+      shellExec(`kubectl apply -k ${underpostRoot}/manifests/deployment/adminer/. -n ${options.namespace}`);
       const successInstance = await UnderpostTest.API.statusMonitor('adminer', 'Running', 'pods', 1000, 60 * 10);
 
       if (successInstance) {
@@ -921,7 +924,7 @@ class UnderpostRun {
       const env = 'production';
       const ignorePods = UnderpostDeploy.API.get(`${deployId}-${env}-${targetTraffic}`).map((p) => p.NAME);
 
-      shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic}`);
+      shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic} -n ${options.namespace}`);
 
       await UnderpostDeploy.API.monitorReadyRunner(deployId, env, targetTraffic, ignorePods);
 
@@ -1042,9 +1045,9 @@ class UnderpostRun {
       );
       switch (serviceId) {
         case 'mongo-express-service': {
-          shellExec(`kubectl delete svc mongo-express-service --ignore-not-found`);
-          shellExec(`kubectl delete deployment mongo-express --ignore-not-found`);
-          shellExec(`kubectl apply -f manifests/deployment/mongo-express/deployment.yaml`);
+          shellExec(`kubectl delete svc mongo-express-service -n ${options.namespace} --ignore-not-found`);
+          shellExec(`kubectl delete deployment mongo-express -n ${options.namespace} --ignore-not-found`);
+          shellExec(`kubectl apply -f manifests/deployment/mongo-express/deployment.yaml -n ${options.namespace}`);
           podToMonitor = 'mongo-express';
           break;
         }
@@ -1143,7 +1146,11 @@ class UnderpostRun {
         shellExec(`${baseCommand} env ${deployId} ${env}`);
         for (const host of Object.keys(confServer))
           if (_path in confServer[host]) shellExec(`node bin/deploy build-single-replica ${deployId} ${host} ${_path}`);
-        const node = options.dev || !isDeployRunnerContext(path, options) ? 'kind-control-plane' : os.hostname();
+        const node = options.nodeName
+          ? options.nodeName
+          : options.dev || !isDeployRunnerContext(path, options)
+            ? 'kind-control-plane'
+            : os.hostname();
         // deployId, replicas, versions, image, node
         let defaultPath = [deployId, 1, ``, ``, node];
         shellExec(`${baseCommand} run${options.dev === true ? ' --dev' : ''} --build sync ${defaultPath}`);
@@ -1220,6 +1227,16 @@ class UnderpostRun {
       const imagePullPolicy = options.imagePullPolicy || 'IfNotPresent';
       const hostNetwork = options.hostNetwork ? options.hostNetwork : '';
       const apiVersion = options.apiVersion || 'v1';
+      const labels = options.labels
+        ? options.labels
+            .split(',')
+            .map((keyValue) => {
+              const [key, value] = keyValue.split('=');
+              return `    ${key}: ${value}
+`;
+            })
+            .join('')
+        : `    app: ${podName}`;
       if (options.volumeType === 'dev') options.volumeType = 'FileOrCreate';
       const volumeType =
         options.volumeType || (enableVolumeMount && volumeHostPath && fs.statSync(volumeHostPath).isDirectory())
@@ -1235,7 +1252,7 @@ metadata:
   name: ${podName}
   namespace: ${namespace}
   labels:
-    app: ${podName}
+${labels}
 spec:
   restartPolicy: ${restartPolicy}
 ${runtimeClassName ? `  runtimeClassName: ${runtimeClassName}` : ''}
@@ -1273,13 +1290,13 @@ ${
     : ''
 }
 EOF`;
-      shellExec(`kubectl delete pod ${podName} --ignore-not-found`);
+      shellExec(`kubectl delete pod ${podName} -n ${namespace} --ignore-not-found`);
       console.log(cmd);
       shellExec(cmd, { disableLog: true });
       const successInstance = await UnderpostTest.API.statusMonitor(podName);
       if (successInstance) {
         options.on?.init ? await options.on.init() : null;
-        shellExec(`kubectl logs -f ${podName}`);
+        shellExec(`kubectl logs -f ${podName} -n ${namespace}`);
       }
     },
   };

package/src/client/components/core/Logger.js

@@ -6,7 +6,7 @@ const loggerFactory = (meta, options = { trace: false }) => {
   const logger = {
     log: function (type, args) {
       if (!window.renderPayload.dev) return;
-      if (options.trace === true) args.push(getCurrentTrace().split('Logger.js:23')[1]);
+      if (options.trace === true) args.push(getCurrentTrace().split('Logger.js')[1]);
       return console[type](`[${meta}] ${new Date().toISOString()} ${type}:`, ...args);
     },
   };

package/src/client/components/core/Modal.js

@@ -87,6 +87,7 @@ const Modal = {
       onExpandUiListener: {},
       onBarUiOpen: {},
       onBarUiClose: {},
+      onReloadModalListener: {},
       onHome: {},
       homeModals: options.homeModals ? options.homeModals : [],
       query: options.query ? `${window.location.search}` : undefined,
@@ -121,6 +122,7 @@ const Modal = {
         top = `${windowGetH() / 2 - height / 2}px`;
         left = `${windowGetW() / 2 - width / 2}px`;
       },
+      ...this.Data[idModal],
     };
 
     if (options && 'mode' in options) {
@@ -1387,6 +1389,9 @@ const Modal = {
     if (options.zIndexSync) this.zIndexSync({ idModal });
 
     if (s(`.${idModal}`)) {
+      for (const event of Object.keys(Modal.Data[idModal].onReloadModalListener))
+        await Modal.Data[idModal].onReloadModalListener[event]();
+
       s(`.btn-maximize-${idModal}`).click();
       return;
     }