underpost 2.8.7 → 2.8.8

package/src/cli/deploy.js

@@ -15,19 +15,20 @@ import dotenv from 'dotenv';
 import { DataBaseProvider } from '../db/DataBaseProvider.js';
 import UnderpostRootEnv from './env.js';
 import UnderpostCluster from './cluster.js';
+import Underpost from '../index.js';
 
 const logger = loggerFactory(import.meta);
 
 class UnderpostDeploy {
   static NETWORK = {};
   static API = {
-    sync(deployList, { versions, replicas }) {
+    sync(deployList, { versions, replicas, kubeadm = false }) {
       const deployGroupId = 'dd.router';
       fs.writeFileSync(`./engine-private/deploy/${deployGroupId}`, deployList, 'utf8');
       const totalPods = deployList.split(',').length * versions.split(',').length * parseInt(replicas);
       const limitFactor = 0.8;
       const reserveFactor = 0.05;
-      const resources = UnderpostCluster.API.getResourcesCapacity();
+      const resources = UnderpostCluster.API.getResourcesCapacity(kubeadm);
       const memory = parseInt(resources.memory.value / totalPods);
       const cpu = parseInt(resources.cpu.value / totalPods);
       UnderpostRootEnv.API.set(
@@ -80,14 +81,14 @@ spec:
     spec:
       containers:
         - name: ${deployId}-${env}-${suffix}
-          image: localhost/debian:underpost
-          resources:
-            requests:
-              memory: "${resources.requests.memory}"
-              cpu: "${resources.requests.cpu}"
-            limits:
-              memory: "${resources.limits.memory}"
-              cpu: "${resources.limits.cpu}"
+          image: localhost/debian-underpost:${Underpost.version}
+#          resources:
+#            requests:
+#              memory: "${resources.requests.memory}"
+#              cpu: "${resources.requests.cpu}"
+#            limits:
+#              memory: "${resources.limits.memory}"
+#              cpu: "${resources.limits.cpu}"
           command:
             - /bin/sh
             - -c
@@ -243,6 +244,7 @@ spec:
         traffic: '',
         dashboardUpdate: false,
         replicas: '',
+        restoreHosts: false,
         disableUpdateDeployment: false,
         infoTraffic: false,
         rebuildClientsBundle: false,
@@ -254,8 +256,8 @@ 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 service-valkey --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"valkey/valkey:latest"}]'
-kubectl patch statefulset service-valkey -p '{"spec":{"template":{"spec":{"containers":[{"name":"service-valkey","imagePullPolicy":"Never"}]}}}}'
+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
@@ -269,6 +271,31 @@ 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
+
+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
 `);
       if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
         deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');
@@ -295,11 +322,18 @@ kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "p
       shellExec(
         `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
       );
+      let renderHosts = '';
+      let concatHots = '';
       const etcHost = (
         concat,
       ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6`;
-      let concatHots = '';
+      if (options.restoreHosts === true) {
+        renderHosts = etcHost(concatHots);
+        fs.writeFileSync(`/etc/hosts`, renderHosts, 'utf8');
+        logger.info(renderHosts);
+        return;
+      }
 
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
@@ -340,7 +374,6 @@ kubectl patch ippool default-ipv4-ippool --type='json' -p='[{"op": "replace", "p
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
         }
       }
-      let renderHosts;
       switch (process.platform) {
         case 'linux':
           {

package/src/cli/env.js

@@ -25,7 +25,7 @@ class UnderpostRootEnv {
       delete env[key];
       writeEnv(envPath, env);
     },
-    get(key) {
+    get(key, value, options = { plain: false }) {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
       if (!fs.existsSync(envPath)) {
@@ -33,7 +33,7 @@ class UnderpostRootEnv {
         return undefined;
       }
       const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
-      logger.info(`${key}(${typeof env[key]})`, env[key]);
+      options?.plain === true ? console.log(env[key]) : logger.info(`${key}(${typeof env[key]})`, env[key]);
       return env[key];
     },
     list() {

package/src/cli/image.js

@@ -1,9 +1,9 @@
 import fs from 'fs-extra';
-import { shellCd, shellExec } from '../server/process.js';
 import dotenv from 'dotenv';
-import { awaitDeployMonitor, getNpmRootPath } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
-import UnderpostMonitor from './monitor.js';
+import Underpost from '../index.js';
+import { getUnderpostRootPath } from '../server/conf.js';
+import { shellExec } from '../server/process.js';
 
 dotenv.config();
 
@@ -12,9 +12,62 @@ const logger = loggerFactory(import.meta);
 class UnderpostImage {
   static API = {
     dockerfile: {
-      pullBaseImages() {
+      /**
+       * @method pullBaseImages
+       * @description Pulls base images and builds a 'debian-underpost' image,
+       * then loads it into the specified Kubernetes cluster type (Kind, Kubeadm, or K3s).
+       * @param {object} options - Options for pulling and loading images.
+       * @param {boolean} [options.kindLoad=false] - If true, load image into Kind cluster.
+       * @param {boolean} [options.kubeadmLoad=false] - If true, load image into Kubeadm cluster.
+       * @param {boolean} [options.k3sLoad=false] - If true, load image into K3s cluster.
+       * @param {string} [options.path=false] - Path to the Dockerfile context.
+       * @param {string} [options.version=''] - Version tag for the image.
+       */
+      pullBaseImages(
+        options = {
+          kindLoad: false,
+          kubeadmLoad: false,
+          k3sLoad: false,
+          path: false,
+          version: '',
+        },
+      ) {
         shellExec(`sudo podman pull docker.io/library/debian:buster`);
+        const IMAGE_NAME = `debian-underpost`;
+        const IMAGE_NAME_FULL = `${IMAGE_NAME}:${options.version ?? Underpost.version}`;
+        let LOAD_TYPE = '';
+        if (options.kindLoad === true) {
+          LOAD_TYPE = `--kind-load`;
+        } else if (options.kubeadmLoad === true) {
+          LOAD_TYPE = `--kubeadm-load`;
+        } else if (options.k3sLoad === true) {
+          // Handle K3s load type
+          LOAD_TYPE = `--k3s-load`;
+        }
+
+        shellExec(
+          `underpost dockerfile-image-build --podman-save --reset --image-path=. --path ${
+            options.path ?? getUnderpostRootPath()
+          } --image-name=${IMAGE_NAME_FULL} ${LOAD_TYPE}`,
+        );
       },
+      /**
+       * @method build
+       * @description Builds a Docker image using Podman, optionally saves it as a tar archive,
+       * and loads it into a specified Kubernetes cluster (Kind, Kubeadm, or K3s).
+       * @param {object} options - Options for building and loading images.
+       * @param {string} [options.path=''] - The path to the directory containing the Dockerfile.
+       * @param {string} [options.imageName=''] - The name and tag for the image (e.g., 'my-app:latest').
+       * @param {string} [options.imagePath=''] - Directory to save the image tar file.
+       * @param {string} [options.dockerfileName=''] - Name of the Dockerfile (defaults to 'Dockerfile').
+       * @param {boolean} [options.podmanSave=false] - If true, save the image as a tar archive using Podman.
+       * @param {boolean} [options.kindLoad=false] - If true, load the image archive into a Kind cluster.
+       * @param {boolean} [options.kubeadmLoad=false] - If true, load the image archive into a Kubeadm cluster (uses 'ctr').
+       * @param {boolean} [options.k3sLoad=false] - If true, load the image archive into a K3s cluster (uses 'k3s ctr').
+       * @param {boolean} [options.secrets=false] - If true, load secrets from the .env file for the build.
+       * @param {string} [options.secretsPath=''] - Custom path to the .env file for secrets.
+       * @param {boolean} [options.reset=false] - If true, perform a no-cache build.
+       */
       build(
         options = {
           path: '',
@@ -23,13 +76,26 @@ class UnderpostImage {
           dockerfileName: '',
           podmanSave: false,
           kindLoad: false,
+          kubeadmLoad: false,
+          k3sLoad: false,
           secrets: false,
           secretsPath: '',
-          noCache: false,
+          reset: false,
         },
       ) {
-        const { path, imageName, imagePath, dockerfileName, podmanSave, secrets, secretsPath, kindLoad, noCache } =
-          options;
+        const {
+          path,
+          imageName,
+          imagePath,
+          dockerfileName,
+          podmanSave,
+          secrets,
+          secretsPath,
+          kindLoad,
+          kubeadmLoad,
+          k3sLoad,
+          reset,
+        } = options;
         const podManImg = `localhost/${imageName}`;
         if (imagePath && typeof imagePath === 'string' && !fs.existsSync(imagePath))
           fs.mkdirSync(imagePath, { recursive: true });
@@ -45,11 +111,11 @@ class UnderpostImage {
             ),
           );
           for (const key of Object.keys(envObj)) {
-            secretsInput += ` && export ${key}="${envObj[key]}" `; // $(cat gitlab-token.txt)
+            secretsInput += ` && export ${key}="${envObj[key]}" `; // Example: $(cat gitlab-token.txt)
             secretDockerInput += ` --secret id=${key},env=${key} \ `;
           }
         }
-        if (noCache === true) cache += ' --rm --no-cache';
+        if (reset === true) cache += ' --rm --no-cache';
         if (path && typeof path === 'string')
           shellExec(
             `cd ${path}${secretsInput}&& sudo podman build -f ./${
@@ -59,6 +125,14 @@ class UnderpostImage {
 
         if (podmanSave === true) shellExec(`podman save -o ${tarFile} ${podManImg}`);
         if (kindLoad === true) shellExec(`sudo kind load image-archive ${tarFile}`);
+        if (kubeadmLoad === true) {
+          // Use 'ctr' for Kubeadm
+          shellExec(`sudo ctr -n k8s.io images import ${tarFile}`);
+        }
+        if (k3sLoad === true) {
+          // Use 'k3s ctr' for K3s
+          shellExec(`sudo k3s ctr images import ${tarFile}`);
+        }
       },
     },
   };

package/src/cli/index.js

@@ -1,10 +1,12 @@
 import dotenv from 'dotenv';
 import { Command } from 'commander';
 import Underpost from '../index.js';
-import { getUnderpostRootPath, loadConf } from '../server/conf.js';
+import { getNpmRootPath, getUnderpostRootPath, loadConf } from '../server/conf.js';
 import fs from 'fs-extra';
 import { commitData } from '../client/components/core/CommonJs.js';
 import { shellExec } from '../server/process.js';
+import UnderpostLxd from './lxd.js';
+import UnderpostBaremetal from './baremetal.js';
 
 const underpostRootPath = getUnderpostRootPath();
 fs.existsSync(`${underpostRootPath}/.env`)
@@ -34,6 +36,7 @@ program
   .command('clone')
   .argument(`<uri>`, 'e.g. username/repository')
   .option('--bare', 'Clone only .git files')
+  .option('-g8', 'Use g8 repo extension')
   .description('Clone github repository')
   .action(Underpost.repo.clone);
 
@@ -42,6 +45,7 @@ program
   .argument('<path>', 'Absolute or relative directory')
   .argument(`<uri>`, 'e.g. username/repository')
   .description('Pull github repository')
+  .option('-g8', 'Use g8 repo extension')
   .action(Underpost.repo.pull);
 
 program
@@ -61,6 +65,7 @@ program
   .argument('<path>', 'Absolute or relative directory')
   .argument(`<uri>`, 'e.g. username/repository')
   .option('-f', 'Force push overwriting repository')
+  .option('-g8', 'Use g8 repo extension')
   .description('Push github repository')
   .action(Underpost.repo.push);
 
@@ -76,8 +81,9 @@ program
   .argument('operator', `Options: ${Object.keys(Underpost.env)}`)
   .argument('[key]', 'Config key')
   .argument('[value]', 'Config value')
+  .option('--plain', 'Print plain value')
   .description(`Manage configuration, operators`)
-  .action((...args) => Underpost.env[args[0]](args[1], args[2]));
+  .action((...args) => Underpost.env[args[0]](args[1], args[2], args[3]));
 
 program
   .command('root')
@@ -89,27 +95,35 @@ program
   .argument('[pod-name]', 'Optional pod name filter')
   .option('--reset', `Delete all clusters and prune all data and caches`)
   .option('--mariadb', 'Init with mariadb statefulset')
+  .option('--mysql', 'Init with mysql statefulset')
   .option('--mongodb', 'Init with mongodb statefulset')
   .option('--postgresql', 'Init with postgresql statefulset')
   .option('--mongodb4', 'Init with mongodb 4.4 service')
-  .option('--istio', 'Init base istio cluster')
+  //  .option('--istio', 'Init base istio service mesh')
   .option('--valkey', 'Init with valkey service')
   .option('--contour', 'Init with project contour base HTTPProxy and envoy')
   .option('--cert-manager', 'Init with letsencrypt-prod ClusterIssuer')
+  .option('--dedicated-gpu', 'Init with dedicated gpu base resources env')
   .option('--info', 'Get all kinds objects deployed')
   .option('--full', 'Init with all statefulsets and services available')
   .option('--ns-use <ns-name>', 'Switches current context to namespace')
+  .option('--kubeadm', 'Init with kubeadm controlplane management')
   .option('--dev', 'init with dev cluster')
   .option('--list-pods', 'Display list pods information')
   .option('--info-capacity', 'display current total machine capacity info')
   .option('--info-capacity-pod', 'display current machine capacity pod info')
   .option('--pull-image', 'Set optional pull associated image')
+  .option('--init-host', 'Install k8s node necessary cli env: kind, kubeadm, docker, podman, helm')
+  .option('--config', 'Set k8s base node config')
+  .option('--worker', 'Set worker node context')
+  .option('--chown', 'Set k8s kube chown')
+  .option('--k3s', 'Initialize the cluster using K3s')
   .action(Underpost.cluster.init)
   .description('Manage cluster, for default initialization base kind cluster');
 
 program
   .command('deploy')
-  .argument('<deploy-list>', 'Deploy id list, e.g. default-a,default-b')
+  .argument('[deploy-list]', 'Deploy id list, e.g. default-a,default-b')
   .argument('[env]', 'Optional environment, for default is development')
   .option('--remove', 'Delete deployments and services')
   .option('--sync', 'Sync deployments env, ports, and replicas')
@@ -124,6 +138,8 @@ program
   .option('--traffic <traffic-versions>', 'Comma separated custom deployment traffic')
   .option('--disable-update-deployment', 'Disable update deployments')
   .option('--info-traffic', 'get traffic conf form current resources deployments')
+  .option('--kubeadm', 'Enable kubeadm context')
+  .option('--restore-hosts', 'Restore defautl etc hosts')
   .option(
     '--rebuild-clients-bundle',
     'Inside container, rebuild clients bundle, only static public or storage client files',
@@ -154,14 +170,21 @@ program
   .option('--dockerfile-name [dockerfile-name]', 'set Dockerfile name')
   .option('--podman-save', 'Export tar file from podman')
   .option('--kind-load', 'Import tar image to Kind cluster')
+  .option('--kubeadm-load', 'Import tar image to Kubeadm cluster')
   .option('--secrets', 'Dockerfile env secrets')
   .option('--secrets-path [secrets-path]', 'Dockerfile custom path env secrets')
-  .option('--no-cache', 'Build without using cache')
+  .option('--reset', 'Build without using cache')
+  .option('--k3s-load', 'Load image into K3s cluster.')
   .description('Build image from Dockerfile')
   .action(Underpost.image.dockerfile.build);
 
 program
   .command('dockerfile-pull-base-images')
+  .option('--path [path]', 'Dockerfile path')
+  .option('--kind-load', 'Import tar image to Kind cluster')
+  .option('--kubeadm-load', 'Import tar image to Kubeadm cluster')
+  .option('--version', 'Set custom version')
+  .option('--k3s-load', 'Load image into K3s cluster.')
   .description('Pull underpost dockerfile images requirements')
   .action(Underpost.image.dockerfile.pullBaseImages);
 
@@ -252,61 +275,45 @@ program
   .description('Monitor health server management')
   .action(Underpost.monitor.callback);
 
-const buildCliDoc = () => {
-  let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
-  const baseOptions =
-    `## ${md[0].split(`\n`)[2]}
-
-### Usage: ` +
-    '`' +
-    md[0].split(`\n`)[0].split('Usage: ')[1] +
-    '`' +
-    `
-  ` +
-    '```\n Options:' +
-    md[1] +
-    ' \n```';
-  md =
-    baseOptions +
-    `
-
-## Commands:
-    `;
-  program.commands.map((o) => {
-    md +=
-      `
-
-` +
-      '### `' +
-      o._name +
-      '` :' +
-      `
-` +
-      '```\n ' +
-      shellExec(`node bin help ${o._name}`, { silent: true, stdout: true }) +
-      ' \n```' +
-      `
-  `;
-  });
-  fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
-  fs.writeFileSync(`./cli.md`, md, 'utf8');
-  const readmeSplit = `pwa-microservices-template</a>`;
-  const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
-  fs.writeFileSync(
-    './README.md',
-    readme[0] +
-      readmeSplit +
-      `
+program
+  .command('lxd')
+  .option('--init', 'Init lxd')
+  .option('--reset', 'Reset lxd on current machine')
+  .option('--install', 'Install lxd on current machine')
+  .option('--dev', 'Set dev context env')
+  .option('--create-virtual-network', 'Create lxd virtual network bridge')
+  .option('--create-admin-profile', 'Create admin profile for lxd management')
+  .option('--control', 'set control node vm context')
+  .option('--worker', 'set worker node context')
+  .option('--create-vm <vm-id>', 'Create default virtual machines')
+  .option('--init-vm <vm-id>', 'Get init vm underpost script')
+  .option('--info-vm <vm-id>', 'Get all info vm')
+  .option('--test <vm-id>', 'Test health, status and network connectivity for a VM')
+  .option('--root-size <gb-size>', 'Set root size vm')
+  .option('--k3s', 'Flag to indicate K3s cluster type for VM initialization')
+  .option('--join-node <nodes>', 'Comma separated worker and control node e. g. k8s-worker-1,k8s-control')
+  .option(
+    '--expose <vm-name-ports>',
+    'Vm name and : separated with Comma separated vm port to expose e. g. k8s-control:80,443',
+  )
+  .option(
+    '--delete-expose <vm-name-ports>',
+    'Vm name and : separated with Comma separated vm port to remove expose e. g. k8s-control:80,443',
+  )
+  .option('--auto-expose-k8s-ports <vm-id>', 'Automatically expose common Kubernetes ports for the VM.')
+  .description('Lxd management')
+  .action(UnderpostLxd.API.callback);
 
-` +
-      baseOptions +
-      `
-      
-<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
-      
-`,
-    'utf8',
-  );
-};
+program
+  .command('baremetal')
+  .option('--control-server-install', 'Install baremetal control server')
+  .option('--control-server-init-db', 'Setup database baremetal control server')
+  .option('--control-server-init', 'Init baremetal control server')
+  .option('--control-server-uninstall', 'Uninstall baremetal control server')
+  .option('--control-server-stop', 'Stop baremetal control server')
+  .option('--control-server-start', 'Start baremetal control server')
+  .option('--dev', 'Set dev context env')
+  .description('Baremetal management')
+  .action(UnderpostBaremetal.API.callback);
 
-export { program, buildCliDoc };
+export { program };