underpost 2.89.37 → 2.89.45

package/src/cli/deploy.js

@@ -129,10 +129,11 @@ class UnderpostDeploy {
      * @param {object} resources - Resource configuration for the deployment.
      * @param {number} replicas - Number of replicas for the deployment.
      * @param {string} image - Docker image for the deployment.
+     * @param {string} namespace - Kubernetes namespace for the deployment.
      * @returns {string} - YAML deployment configuration for the specified deployment.
      * @memberof UnderpostDeploy
      */
-    deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas, image }) {
+    deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas, image, namespace }) {
       const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
       let volumes = [
         {
@@ -149,6 +150,7 @@ class UnderpostDeploy {
 kind: Deployment
 metadata:
   name: ${deployId}-${env}-${suffix}
+  namespace: ${namespace ? namespace : 'default'}
   labels:
     app: ${deployId}-${env}-${suffix}
 spec:
@@ -188,6 +190,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: ${deployId}-${env}-${suffix}-service
+  namespace: ${namespace}
 spec:
   selector:
     app: ${deployId}-${env}-${suffix}
@@ -201,6 +204,7 @@ spec:
      * @param {object} options - Options for the manifest build process.
      * @param {string} options.replicas - Number of replicas for each deployment.
      * @param {string} options.image - Docker image for the deployment.
+     * @param {string} options.namespace - Kubernetes namespace for the deployment.
      * @returns {Promise<void>} - Promise that resolves when the manifest is built.
      * @memberof UnderpostDeploy
      */
@@ -208,6 +212,7 @@ spec:
       const resources = UnderpostDeploy.API.resourcesFactory();
       const replicas = options.replicas;
       const image = options.image;
+      if (!options.namespace) options.namespace = 'default';
 
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
@@ -235,6 +240,7 @@ ${UnderpostDeploy.API.deploymentYamlPartsFactory({
   resources,
   replicas,
   image,
+  namespace: options.namespace,
 }).replace('{{ports}}', buildKindPorts(fromPort, toPort))}
 `;
         }
@@ -257,6 +263,7 @@ apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
   name: ${host}
+  namespace: ${options.namespace}
 spec:
   virtualhost:
     fqdn: ${host}${
@@ -316,16 +323,18 @@ spec:
     /**
      * Builds a Certificate resource for a host using cert-manager.
      * @param {string} host - Hostname for which the certificate is being built.
+     * @param {string} namespace - Kubernetes namespace for the certificate.
      * @returns {string} - Certificate resource YAML for the specified host.
      * @memberof UnderpostDeploy
      */
-    buildCertManagerCertificate({ host }) {
+    buildCertManagerCertificate({ host, namespace }) {
       return `
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: ${host}
+  namespace: ${namespace}
 spec:
   commonName: ${host}
   dnsNames:
@@ -376,6 +385,7 @@ spec:
      * @param {boolean} options.status - Whether to display deployment status.
      * @param {boolean} options.etcHosts - Whether to display the /etc/hosts file.
      * @param {boolean} options.disableUpdateUnderpostConfig - Whether to disable Underpost config updates.
+     * @param {string} [options.namespace] - Kubernetes namespace for the deployment.
      * @returns {Promise<void>} - Promise that resolves when the deployment process is complete.
      * @memberof UnderpostDeploy
      */
@@ -404,74 +414,14 @@ spec:
         status: false,
         etcHosts: false,
         disableUpdateUnderpostConfig: false,
+        namespace: '',
       },
     ) {
-      if (options.infoUtil === true)
-        return logger.info(`
-kubectl rollout restart deployment/deployment-name
-kubectl rollout undo deployment/deployment-name
-kubectl scale statefulsets <stateful-set-name> --replicas=<new-replicas>
-kubectl get pods -w
-kubectl patch statefulset valkey-service --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"valkey/valkey:latest"}]'
-kubectl patch statefulset valkey-service -p '{"spec":{"template":{"spec":{"containers":[{"name":"valkey-service","imagePullPolicy":"Never"}]}}}}'
-kubectl logs -f <pod-name>
-kubectl describe pod <pod-name>
-kubectl exec -it <pod-name> -- bash
-kubectl exec -it <pod-name> -- sh
-docker exec -it kind-control-plane bash
-curl -4 -v google.com
-kubectl taint nodes <node-name> node-role.kubernetes.io/control-plane:NoSchedule-
-kubectl run test-pod --image=busybox:latest --restart=Never -- /bin/sh -c "while true; do sleep 30; done;"
-kubectl run test-pod --image=alpine/curl:latest --restart=Never -- sh -c "sleep infinity"
-kubectl get ippools -o yaml
-kubectl get node <node-name> -o jsonpath='{.spec.podCIDR}'
-kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "path": "/spec/cidr", "value": "10.244.0.0/16"}]'
-kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "path": "/spec/cidr", "value": "192.168.0.0/24"}]'
-sudo podman run --rm localhost/<image-name>:<image-version> <command>
-kubectl get configmap kubelet-config -n kube-system -o yaml > kubelet-config.yaml
-kubectl -n kube-system rollout restart daemonset kube-proxy
-kubectl get EndpointSlice -o wide --all-namespaces -w
-kubectl apply -k manifests/deployment/adminer/.
-kubectl wait --for=condition=Ready pod/busybox1
-kubectl wait --for=jsonpath='{.status.phase}'=Running pod/busybox1
-kubectl wait --for='jsonpath={.status.conditions[?(@.type=="Ready")].status}=True' pod/busybox1
-kubectl wait --for=delete pod/busybox1 --timeout=60s
-
-fqdn: <service>.<namespace>.<kind(svc/pod)>.<cluster-domain(cluster.local)>
-node bin run cluster-build
-node bin run template-deploy
-node bin run ssh-deploy (sync-)engine-core
-node bin run cluster --dev 'express,dd-test+dd-core'
-node bin run dd-container --dev
-node bin run promote dd-default production
-node bin dockerfile-pull-base-images --dev --path 'image-path' --kind-load
-node bin/deploy update-default-conf <deploy-id>
-
-kubectl run --rm -it test-dns --image=busybox:latest --restart=Never -- /bin/sh -c "
-  nslookup kubernetes.default.svc.cluster.local;
-  nslookup mongodb-service.default.svc.cluster.local;
-  nslookup valkey-service.default.svc.cluster.local;
-  nc -vz mongodb-service 27017;
-  nc -vz valkey-service 6379;
-  echo exit code: \\\$?
-"
-
-kubectl apply -f - <<EOF
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: ...
-EOF
-
-https://org.ngc.nvidia.com/setup/api-keys
-docker login nvcr.io
-Username: $oauthtoken
-Password: <Your Key>
-`);
+      const namespace = options.namespace ? options.namespace : 'default';
       if (!deployList && options.certHosts) {
         for (const host of options.certHosts.split(',')) {
-          shellExec(`sudo kubectl apply -f - <<EOF
-${UnderpostDeploy.API.buildCertManagerCertificate({ host })}
+          shellExec(`sudo kubectl apply -f - -n ${namespace} <<EOF
+${UnderpostDeploy.API.buildCertManagerCertificate({ host, namespace })}
 EOF`);
         }
         return;
@@ -540,8 +490,12 @@ EOF`);
 
         if (!options.disableUpdateDeployment)
           for (const version of options.versions.split(',')) {
-            shellExec(`sudo kubectl delete svc ${deployId}-${env}-${version}-service`);
-            shellExec(`sudo kubectl delete deployment ${deployId}-${env}-${version}`);
+            shellExec(
+              `sudo kubectl delete svc ${deployId}-${env}-${version}-service -n ${namespace} --ignore-not-found`,
+            );
+            shellExec(
+              `sudo kubectl delete deployment ${deployId}-${env}-${version} -n ${namespace} --ignore-not-found`,
+            );
             if (!options.disableUpdateVolume) {
               for (const volume of confVolume) {
                 const pvcId = `${volume.claimName}-${deployId}-${env}-${version}`;
@@ -549,9 +503,9 @@ EOF`);
                 const rootVolumeHostPath = `/home/dd/engine/volume/${pvId}`;
                 if (!fs.existsSync(rootVolumeHostPath)) fs.mkdirSync(rootVolumeHostPath, { recursive: true });
                 fs.copySync(volume.volumeMountPath, rootVolumeHostPath);
-                shellExec(`kubectl delete pvc ${pvcId}`);
-                shellExec(`kubectl delete pv ${pvId}`);
-                shellExec(`kubectl apply -f - <<EOF
+                shellExec(`kubectl delete pvc ${pvcId} -n ${namespace} --ignore-not-found`);
+                shellExec(`kubectl delete pv ${pvId} --ignore-not-found`);
+                shellExec(`kubectl apply -f - -n ${namespace} <<EOF
 ${UnderpostDeploy.API.persistentVolumeFactory({
   hostPath: rootVolumeHostPath,
   pvcId,
@@ -564,9 +518,9 @@ EOF
 
         for (const host of Object.keys(confServer)) {
           if (!options.disableUpdateProxy) {
-            shellExec(`sudo kubectl delete HTTPProxy ${host}`);
+            shellExec(`sudo kubectl delete HTTPProxy ${host} -n ${namespace} --ignore-not-found`);
             if (UnderpostDeploy.API.isValidTLSContext({ host, env, options }))
-              shellExec(`sudo kubectl delete Certificate ${host}`);
+              shellExec(`sudo kubectl delete Certificate ${host} -n ${namespace} --ignore-not-found`);
           }
           if (!options.remove) etcHosts.push(host);
         }
@@ -577,11 +531,13 @@ EOF
             : `manifests/deployment/${deployId}-${env}`;
 
         if (!options.remove) {
-          if (!options.disableUpdateDeployment) shellExec(`sudo kubectl apply -f ./${manifestsPath}/deployment.yaml`);
-          if (!options.disableUpdateProxy) shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
+          if (!options.disableUpdateDeployment)
+            shellExec(`sudo kubectl apply -f ./${manifestsPath}/deployment.yaml -n ${namespace}`);
+          if (!options.disableUpdateProxy)
+            shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml -n ${namespace}`);
 
           if (UnderpostDeploy.API.isValidTLSContext({ host: Object.keys(confServer)[0], env, options }))
-            shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
+            shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml -n ${namespace}`);
         }
       }
       if (options.etcHosts === true) {
@@ -598,15 +554,19 @@ EOF
      * Retrieves information about a deployment.
      * @param {string} deployId - Deployment ID for which information is being retrieved.
      * @param {string} kindType - Type of Kubernetes resource to retrieve information for (e.g. 'pods').
+     * @param {string} namespace - Kubernetes namespace to retrieve information from.
      * @returns {Array<object>} - Array of objects containing information about the deployment.
      * @memberof UnderpostDeploy
      */
-    get(deployId, kindType = 'pods') {
-      const raw = shellExec(`sudo kubectl get ${kindType} --all-namespaces -o wide`, {
-        stdout: true,
-        disableLog: true,
-        silent: true,
-      });
+    get(deployId, kindType = 'pods', namespace = '') {
+      const raw = shellExec(
+        `sudo kubectl get ${kindType}${namespace ? ` -n ${namespace}` : ` --all-namespaces`} -o wide`,
+        {
+          stdout: true,
+          disableLog: true,
+          silent: true,
+        },
+      );
 
       const heads = raw
         .split(`\n`)[0]
@@ -720,12 +680,13 @@ EOF
     /**
      * Creates a configmap for a deployment.
      * @param {string} env - Environment for which the configmap is being created.
+     * @param {string} [namespace='default'] - Kubernetes namespace for the configmap.
      * @memberof UnderpostDeploy
      */
-    configMap(env) {
-      shellExec(`kubectl delete configmap underpost-config`);
+    configMap(env, namespace = 'default') {
+      shellExec(`kubectl delete configmap underpost-config -n ${namespace} --ignore-not-found`);
       shellExec(
-        `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
+        `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env} --dry-run=client -o yaml | kubectl apply -f - -n ${namespace}`,
       );
     },
     /**
@@ -734,14 +695,15 @@ EOF
      * @param {string} env - Environment for which the traffic is being switched.
      * @param {string} targetTraffic - Target traffic status for the deployment.
      * @param {number} replicas - Number of replicas for the deployment.
+     * @param {string} [namespace='default'] - Kubernetes namespace for the deployment.
      * @memberof UnderpostDeploy
      */
-    switchTraffic(deployId, env, targetTraffic, replicas = 1) {
+    switchTraffic(deployId, env, targetTraffic, replicas = 1, namespace = 'default') {
       UnderpostRootEnv.API.set(`${deployId}-${env}-traffic`, targetTraffic);
       shellExec(
-        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${replicas} ${deployId} ${env}`,
+        `node bin deploy --info-router --build-manifest --traffic ${targetTraffic} --replicas ${replicas} --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}`);
     },
 
     /**
@@ -909,7 +871,7 @@ ${renderHosts}`,
     getCurrentLoadedImages(node = 'kind-worker', specContainers = false) {
       if (specContainers) {
         const raw = shellExec(
-          `kubectl get pods --all-namespaces -o=jsonpath='{range .items[*]}{"\\n"}{.metadata.name}{":\\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}'`,
+          `kubectl get pods --all-namespaces -o=jsonpath='{range .items[*]}{"\\n"}{.metadata.namespace}{"/"}{.metadata.name}{":\\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}'`,
           {
             stdout: true,
             silent: true,

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')
@@ -144,10 +156,20 @@ program
   .option('--contour', 'Initializes the cluster with Project Contour base HTTPProxy and Envoy.')
   .option('--cert-manager', "Initializes the cluster with a Let's Encrypt production ClusterIssuer.")
   .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(
+    '--pod-network-cidr <cidr>',
+    'Sets custom pod network CIDR for kubeadm cluster initialization (defaults to "192.168.0.0/16").',
+  )
+  .option(
+    '--control-plane-endpoint <endpoint>',
+    'Sets custom control plane endpoint for kubeadm cluster initialization (defaults to "localhost:6443").',
+  )
   .option('--grafana', 'Initializes the cluster with a Grafana deployment.')
   .option(
     '--prom [hosts]',
@@ -166,6 +188,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.');
 
@@ -181,7 +204,6 @@ program
   .option('--sync', 'Synchronizes deployment environment variables, ports, and replica counts.')
   .option('--info-router', 'Displays the current router structure and configuration.')
   .option('--expose', 'Exposes services matching the provided deployment ID list.')
-  .option('--info-util', 'Displays useful `kubectl` utility management commands.')
   .option('--cert', 'Resets TLS/SSL certificate secrets for deployments.')
   .option('--cert-hosts <hosts>', 'Resets TLS/SSL certificate secrets for specified hosts.')
   .option('--node <node>', 'Sets optional node for deployment operations.')
@@ -205,6 +227,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 +425,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

@@ -39,6 +39,7 @@ class UnderpostMonitor {
      * @param {string} [options.type=''] - Type of deployment (e.g., 'blue-green', 'remote').
      * @param {string} [options.replicas=''] - Number of replicas for the deployment.
      * @param {boolean} [options.sync=false] - Synchronize traffic switching with the deployment.
+     * @param {string} [options.namespace=''] - Kubernetes namespace for the deployment.
      * @param {object} [commanderOptions] - Options passed from the command line interface.
      * @param {object} [auxRouter] - Optional router configuration for the deployment.
      * @memberof UnderpostMonitor
@@ -46,10 +47,11 @@ class UnderpostMonitor {
     async callback(
       deployId,
       env = 'development',
-      options = { now: false, single: false, msInterval: '', type: '', replicas: '', sync: false },
+      options = { now: false, single: false, msInterval: '', type: '', replicas: '', sync: false, namespace: '' },
       commanderOptions,
       auxRouter,
     ) {
+      if (!options.namespace) options.namespace = 'default';
       if (deployId === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`)) {
         for (const _deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(','))
           UnderpostMonitor.API.callback(
@@ -95,12 +97,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 +155,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
@@ -493,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');
@@ -510,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);
@@ -619,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)
@@ -682,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';
@@ -764,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) {
@@ -922,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);
 
@@ -1043,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;
         }
@@ -1225,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())
@@ -1240,7 +1252,7 @@ metadata:
   name: ${podName}
   namespace: ${namespace}
   labels:
-    app: ${podName}
+${labels}
 spec:
   restartPolicy: ${restartPolicy}
 ${runtimeClassName ? `  runtimeClassName: ${runtimeClassName}` : ''}
@@ -1278,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}`);
       }
     },
   };
@@ -1306,6 +1318,7 @@ EOF`;
         if (options.command) options.command = options.command.split(',');
         if (options.args) options.args = options.args.split(',');
         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;
     }