cyberia 2.89.2 → 2.89.45

package/src/cli/run.js

@@ -60,9 +60,16 @@ class UnderpostRun {
    * @property {string} tty - The TTY option for the container.
    * @property {string} stdin - The stdin option for the container.
    * @property {string} restartPolicy - The restart policy for the container.
+   * @property {string} runtimeClassName - The runtime class name for the container.
+   * @property {string} imagePullPolicy - The image pull policy for the container.
+   * @property {string} apiVersion - The API version for the container.
+   * @property {string} claimName - The claim name for the volume.
+   * @property {string} kind - The kind of resource to create.
    * @property {boolean} terminal - Whether to open a terminal.
    * @property {number} devProxyPortOffset - The port offset for the development proxy.
+   * @property {boolean} hostNetwork - Whether to use host networking.
    * @property {string} confServerPath - The configuration server path.
+   * @property {string} underpostRoot - The root path of the Underpost installation.
    * @memberof UnderpostRun
    */
   static DEFAULT_OPTION = {
@@ -74,7 +81,7 @@ class UnderpostRun {
     volumeMountPath: '',
     imageName: '',
     containerName: '',
-    namespace: '',
+    namespace: 'default',
     build: false,
     replicas: 1,
     k3s: false,
@@ -85,9 +92,16 @@ class UnderpostRun {
     tty: '',
     stdin: '',
     restartPolicy: '',
+    runtimeClassName: '',
+    imagePullPolicy: '',
+    apiVersion: '',
+    claimName: '',
+    kind: '',
     terminal: false,
     devProxyPortOffset: 0,
+    hostNetwork: false,
     confServerPath: '',
+    underpostRoot: '',
   };
   /**
    * @static
@@ -195,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
@@ -326,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()}`);
@@ -478,7 +493,7 @@ class UnderpostRun {
       versions = versions ? versions.replaceAll('+', ',') : defaultPath[2];
       image = image ? image : defaultPath[3];
       node = node ? node : defaultPath[4];
-
+      shellExec(`${baseCommand} cluster --ns-use ${options.namespace}`);
       if (isDeployRunnerContext(path, options)) {
         const { validVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
         if (!validVersion) throw new Error('Version mismatch');
@@ -495,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);
@@ -578,40 +595,75 @@ class UnderpostRun {
     },
 
     /**
-     * @method dev-container
-     * @description Runs a development container pod named `underpost-dev-container` with specified volume mounts and opens a terminal to follow its logs.
-     * @param {string} path - The input value, identifier, or path for the operation (used as an optional command to run inside the container).
+     * @method dd-container
+     * @description Deploys a development or debug container tasks jobs, setting up necessary volumes and images, and running specified commands within the container.
+     * @param {string} path - The input value, identifier, or path for the operation (used as the command to run inside the container).
      * @param {Object} options - The default underpost runner options for customizing workflow
      * @memberof UnderpostRun
      */
-    'dev-container': async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
-      options.dev = true;
+    'dd-container': async (path = '', options = UnderpostRun.DEFAULT_OPTION) => {
       const baseCommand = options.dev ? 'node bin' : 'underpost';
       const baseClusterCommand = options.dev ? ' --dev' : '';
-      const currentImage = UnderpostDeploy.API.getCurrentLoadedImages('kind-worker', false).find((o) =>
-        o.IMAGE.match('underpost'),
-      );
-      const podName = `underpost-dev-container`;
-      if (!UnderpostDeploy.API.existsContainerFile({ podName: 'kind-worker', path: '/home/dd/engine' })) {
-        shellExec(`docker exec -i kind-worker bash -c "mkdir -p /home/dd"`);
-        shellExec(`docker cp /home/dd/engine kind-worker:/home/dd/engine`);
-        shellExec(`docker exec -i kind-worker bash -c "chown -R 1000:1000 /home/dd || true; chmod -R 755 /home/dd"`);
+      const currentImage = options.imageName
+        ? options.imageName
+        : UnderpostDeploy.API.getCurrentLoadedImages(options.nodeName ? options.nodeName : 'kind-worker', false).find(
+            (o) => o.IMAGE.match('underpost'),
+          );
+      const podName = options.podName || `underpost-dev-container`;
+      const volumeHostPath = options.claimName || '/home/dd';
+      const claimName = options.claimName || `pvc-dd`;
+
+      if (!options.nodeName) {
+        shellExec(`docker exec -i kind-worker bash -c "rm -rf ${volumeHostPath}"`);
+        shellExec(`docker exec -i kind-worker bash -c "mkdir -p ${volumeHostPath}"`);
+        shellExec(`docker cp ${volumeHostPath}/engine kind-worker:${volumeHostPath}/engine`);
+        shellExec(
+          `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 -n ${options.namespace}`);
       }
-      if (!currentImage) shellExec(`${baseCommand} dockerfile-pull-base-images${baseClusterCommand} --kind-load`);
+
+      if (!currentImage)
+        shellExec(
+          `${baseCommand} dockerfile-pull-base-images${baseClusterCommand} ${options.dev ? '--kind-load' : '--kubeadm-load'}`,
+        );
       // shellExec(`kubectl delete pod ${podName} --ignore-not-found`);
-      await UnderpostRun.RUNNERS['deploy-job']('', {
-        dev: true,
+
+      const payload = {
+        ...options,
         podName,
-        imageName: currentImage ? currentImage.image : `localhost/rockylinux9-underpost:${Underpost.version}`,
-        volumeHostPath: '/home/dd',
-        volumeMountPath: '/home/dd',
+        imageName: currentImage
+          ? currentImage.image
+            ? currentImage.image
+            : currentImage.IMAGE
+              ? `${currentImage.IMAGE}:${currentImage.TAG}`
+              : `localhost/rockylinux9-underpost:${Underpost.version}`
+          : `localhost/rockylinux9-underpost:${Underpost.version}`,
+        volumeMountPath: volumeHostPath,
+        ...(options.dev ? { volumeHostPath } : { claimName }),
         on: {
           init: async () => {
             // openTerminal(`kubectl logs -f ${podName}`);
           },
         },
-        args: [daemonProcess(path ? path : `cd /home/dd/engine && npm run test`)],
-      });
+        args: [daemonProcess(path ? path : `cd /home/dd/engine && npm install && npm run test`)],
+      };
+
+      await UnderpostRun.RUNNERS['deploy-job'](path, payload);
+    },
+
+    /**
+     * @method ip-info
+     * @description Executes the `ip-info.sh` script to display IP-related information for the specified path.
+     * @param {string} path - The input value, identifier, or path for the operation (used as an argument to the script).
+     * @param {Object} options - The default underpost runner options for customizing workflow
+     * @memberof UnderpostRun
+     */
+    'ip-info': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const { underpostRoot } = options;
+      shellExec(`chmod +x ${underpostRoot}/scripts/ip-info.sh`);
+      shellExec(`${underpostRoot}/scripts/ip-info.sh ${path}`);
     },
 
     /**
@@ -632,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';
@@ -714,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) {
@@ -872,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);
 
@@ -993,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;
         }
@@ -1094,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}`);
@@ -1153,40 +1209,58 @@ class UnderpostRun {
     'deploy-job': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const podName = options.podName || 'deploy-job';
       const volumeName = `${podName}-volume`;
-      const args = (options.args ? options.args : path ? [`python ${path}`] : []).filter((c) => c.trim());
+      if (typeof options.args === 'string') options.args = options.args.split(',');
+      const args = (options.args ? options.args : path ? [path] : [`python ${path}`]).filter((c) => c.trim());
       const imageName = options.imageName || 'nvcr.io/nvidia/tensorflow:24.04-tf2-py3';
       const containerName = options.containerName || `${podName}-container`;
       const gpuEnable = imageName.match('nvidia');
-      const runtimeClassName = gpuEnable ? 'nvidia' : '';
+      const runtimeClassName = options.runtimeClassName ? options.runtimeClassName : gpuEnable ? 'nvidia' : '';
       const namespace = options.namespace || 'default';
       const volumeMountPath = options.volumeMountPath || path;
       const volumeHostPath = options.volumeHostPath || path;
-      const enableVolumeMount = volumeHostPath && volumeMountPath;
+      const claimName = options.claimName || '';
+      const enableVolumeMount = volumeMountPath && (volumeHostPath || claimName);
       const tty = options.tty ? 'true' : 'false';
       const stdin = options.stdin ? 'true' : 'false';
       const restartPolicy = options.restartPolicy || 'Never';
-
+      const kind = options.kind || 'Pod';
+      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 && fs.statSync(volumeHostPath).isDirectory()) ? 'Directory' : 'File';
+        options.volumeType || (enableVolumeMount && volumeHostPath && fs.statSync(volumeHostPath).isDirectory())
+          ? 'Directory'
+          : 'File';
 
       const envs = UnderpostRootEnv.API.list();
 
       const cmd = `kubectl apply -f - <<EOF
-apiVersion: v1
-kind: Pod
+apiVersion: ${apiVersion}
+kind: ${kind}
 metadata:
   name: ${podName}
   namespace: ${namespace}
   labels:
-    app: ${podName}
+${labels}
 spec:
   restartPolicy: ${restartPolicy}
 ${runtimeClassName ? `  runtimeClassName: ${runtimeClassName}` : ''}
+${hostNetwork ? `  hostNetwork: ${hostNetwork}` : ''}
   containers:
     - name: ${containerName}
       image: ${imageName}
-      imagePullPolicy: IfNotPresent
+      imagePullPolicy: ${imagePullPolicy}
       tty: ${tty}
       stdin: ${stdin}
       command: ${JSON.stringify(options.command ? options.command : ['/bin/bash', '-c'])}
@@ -1212,25 +1286,17 @@ ${Object.keys(envs)
   .join('\n')}`}
 ${
   enableVolumeMount
-    ? `
-      volumeMounts:
-        - name: ${volumeName}
-          mountPath: ${volumeMountPath}
-  volumes:
-    - name: ${volumeName}
-      hostPath:
-        path: ${volumeHostPath}
-        type: ${volumeType}`
+    ? UnderpostDeploy.API.volumeFactory([{ volumeMountPath, volumeName, volumeHostPath, volumeType, claimName }]).render
     : ''
 }
 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}`);
       }
     },
   };
@@ -1251,7 +1317,8 @@ EOF`;
         const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
         if (options.command) options.command = options.command.split(',');
         if (options.args) options.args = options.args.split(',');
-        options.underpostRoot = underpostRoot;
+        if (!options.underpostRoot) options.underpostRoot = underpostRoot;
+        if (!options.namespace) options.namespace = 'default';
         options.npmRoot = npmRoot;
         logger.info('callback', { path, options });
         if (!(runner in UnderpostRun.RUNNERS)) throw new Error(`Runner not found: ${runner}`);

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;
     }