underpost 2.8.781 → 2.8.783

package/README.md

@@ -68,7 +68,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.781
+## underpost ci/cd cli v2.8.783
 
 ### Usage: `underpost [options] [command]`
   ```

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.781
+## underpost ci/cd cli v2.8.783
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -204,7 +204,6 @@ Options:
   --mongodb            Init with mongodb statefulset
   --postgresql         Init with postgresql statefulset
   --mongodb4           Init with mongodb 4.4 service
-  --istio              Init base istio cluster
   --valkey             Init with valkey service
   --contour            Init with project contour base HTTPProxy and envoy
   --cert-manager       Init with letsencrypt-prod ClusterIssuer
@@ -473,10 +472,15 @@ Options:
 Lxd management
 
 Options:
-  --init      Init lxd
-  --reset     Reset lxd on current machine
-  --install   Install lxd on current machine
-  -h, --help  display help for command
+  --init                    Init lxd
+  --reset                   Reset lxd on current machine
+  --install                 Install lxd on current machine
+  --dev                     Set dev context env
+  --create-virtual-network  Create lxd virtual network bridge
+  --create-admin-profile    Create admin profile for lxd management
+  --create-vm <vm-id>       Create default virtual machines
+  --init-vm <vm-id>         Get init vm underpost script
+  -h, --help                display help for command
  
 ```
   

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.781'
+      engine.version: '2.8.783'
     networks:
       - load-balancer
 

package/manifests/lxd/lxd-admin-profile.yaml

@@ -0,0 +1,16 @@
+config:
+  limits.cpu: "2"
+  limits.memory: 4GB
+description: vm nat network
+devices:
+  eth0:
+    name: eth0
+    network: lxdbr0
+    type: nic
+  root:
+    path: /
+    pool: local # lxc storage list
+    size: 100GB
+    type: disk
+name: admin-profile
+used_by: []

package/manifests/lxd/lxd-preseed.yaml

@@ -0,0 +1,30 @@
+config:
+  core.https_address: 127.0.0.1:8443
+networks: []
+storage_pools:
+  - config:
+      size: 100GiB
+    description: ""
+    name: local
+    driver: zfs
+storage_volumes: []
+profiles:
+  - config: {}
+    description: ""
+    devices:
+      root:
+        path: /
+        pool: local
+        type: disk
+    name: default
+projects: []
+cluster:
+  server_name: lxd-node1
+  enabled: true
+  member_config: []
+  cluster_address: ""
+  cluster_certificate: ""
+  server_address: ""
+  cluster_password: ""
+  cluster_token: ""
+  cluster_certificate_path: ""

package/manifests/lxd/underpost-setup.sh

@@ -0,0 +1,11 @@
+mkdir -p /home/dd
+sudo dnf install -y tar
+sudo dnf install -y bzip2
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+nvm install 23.8.0
+nvm use 23.8.0
+npm install -g underpost
+chmod +x /root/.nvm/versions/node/v23.8.0/bin/underpost
+sudo modprobe br_netfilter

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.781",
+    "version": "2.8.783",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/cluster.js

@@ -92,8 +92,8 @@ class UnderpostCluster {
 
       if (
         !alrreadyCluster &&
-        ((!options.istio && !UnderpostDeploy.API.get('kube-apiserver-kind-control-plane')[0]) ||
-          (options.istio === true && !UnderpostDeploy.API.get('calico-kube-controllers')[0]))
+        ((!options.kubeadm && !UnderpostDeploy.API.get('kube-apiserver-kind-control-plane')[0]) ||
+          (options.kubeadm === true && !UnderpostDeploy.API.get('calico-kube-controllers')[0]))
       ) {
         shellExec(`sudo setenforce 0`);
         shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
@@ -106,7 +106,9 @@ class UnderpostCluster {
         shellExec(`sudo service docker restart`);
         shellExec(`sudo systemctl enable --now containerd.service`);
         shellExec(`sudo swapoff -a; sudo sed -i '/swap/d' /etc/fstab`);
-        if (options.istio === true) {
+        shellExec(`sudo systemctl daemon-reload`);
+        shellExec(`sudo systemctl restart containerd`);
+        if (options.kubeadm === true) {
           shellExec(`sysctl net.bridge.bridge-nf-call-iptables=1`);
           shellExec(
             `sudo kubeadm init --pod-network-cidr=192.168.0.0/16 --control-plane-endpoint="${os.hostname()}:6443"`,
@@ -121,14 +123,12 @@ class UnderpostCluster {
           //   `wget https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/custom-resources.yaml`,
           // );
           shellExec(`sudo kubectl apply -f ${underpostRoot}/manifests/kubeadm-calico-config.yaml`);
-          shellExec(`sudo systemctl restart containerd`);
           const nodeName = os.hostname();
           shellExec(`kubectl taint nodes ${nodeName} node-role.kubernetes.io/control-plane:NoSchedule-`);
           shellExec(
             `kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/deploy/local-path-storage.yaml`,
           );
         } else {
-          shellExec(`sudo systemctl restart containerd`);
           if (options.full === true || options.dedicatedGpu === true) {
             // https://kubernetes.io/docs/tasks/manage-gpus/scheduling-gpus/
             shellExec(`cd ${underpostRoot}/manifests && kind create cluster --config kind-config-cuda.yaml`);
@@ -464,14 +464,14 @@ Allocatable:
     },
     initHost() {
       // Base
-      shellExec(`sudo dnf update -y`);
-      shellExec(`sudo dnf install epel-release -y`);
+      shellExec(`sudo dnf -y update`);
+      shellExec(`sudo dnf -y install epel-release`);
       // Install docker
       shellExec(`sudo dnf -y install dnf-plugins-core
 sudo dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo`);
-      shellExec(`sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
+      shellExec(`sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
       // Install podman
-      shellExec(`sudo dnf install podman`);
+      shellExec(`sudo dnf -y install podman`);
       // Install kind
       shellExec(`[ $(uname -m) = aarch64 ] && curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.29.0/kind-linux-arm64
 chmod +x ./kind

package/src/cli/index.js

@@ -1,7 +1,7 @@
 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';
@@ -97,7 +97,7 @@ program
   .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')
@@ -272,6 +272,11 @@ program
   .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('--create-vm <vm-id>', 'Create default virtual machines')
+  .option('--init-vm <vm-id>', 'Get init vm underpost script')
   .description('Lxd management')
   .action(UnderpostLxd.API.callback);
 

package/src/cli/lxd.js

@@ -1,8 +1,21 @@
-import { shellExec } from '../server/process.js';
+import { getNpmRootPath } from '../server/conf.js';
+import { pbcopy, shellExec } from '../server/process.js';
 
 class UnderpostLxd {
   static API = {
-    async callback(options = { init: false, reset: false, install: false }) {
+    async callback(
+      options = {
+        init: false,
+        reset: false,
+        dev: false,
+        install: false,
+        createVirtualNetwork: false,
+        initVm: false,
+        createVm: '',
+      },
+    ) {
+      const npmRoot = getNpmRootPath();
+      const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
       if (options.reset === true) {
         shellExec(`sudo systemctl stop snap.lxd.daemon`);
         shellExec(`sudo snap remove lxd --purge`);
@@ -11,6 +24,28 @@ class UnderpostLxd {
       if (options.init === true) {
         shellExec(`sudo systemctl start snap.lxd.daemon`);
         shellExec(`sudo systemctl status snap.lxd.daemon`);
+        shellExec(`lxd init --preseed < ${underpostRoot}/manifests/lxd/lxd-preseed.yaml`);
+        shellExec(`lxc cluster list`);
+      }
+      if (options.createVirtualNetwork === true) {
+        shellExec(`lxc network create lxdbr0 \
+ipv4.address=10.250.250.1/24 \
+ipv4.nat=true \
+ipv4.dhcp=true \
+ipv6.address=none`);
+      }
+      if (options.createAdminProfile === true) {
+        pbcopy(`lxc profile create admin-profile`);
+        shellExec(`cat ${underpostRoot}/manifests/lxd/lxd-admin-profile.yaml | lxc profile edit admin-profile`);
+        shellExec(`lxc profile show admin-profile`);
+      }
+      if (options.createVm && typeof options.createVm === 'string') {
+        pbcopy(
+          `lxc launch images:rockylinux/9 ${options.createVm} --vm --target lxd-node1 -c limits.cpu=2 -c limits.memory=4GB --profile admin-profile`,
+        );
+      }
+      if (options.initVm && typeof options.initVm === 'string') {
+        pbcopy(`cat ${underpostRoot}/manifests/lxd/underpost-setup.sh | lxc exec ${options.initVm} -- bash`);
       }
     },
   };

package/src/index.js

@@ -11,6 +11,7 @@ import UnderpostDeploy from './cli/deploy.js';
 import UnderpostRootEnv from './cli/env.js';
 import UnderpostFileStorage from './cli/fs.js';
 import UnderpostImage from './cli/image.js';
+import UnderpostLxd from './cli/lxd.js';
 import UnderpostMonitor from './cli/monitor.js';
 import UnderpostRepository from './cli/repository.js';
 import UnderpostScript from './cli/script.js';
@@ -30,7 +31,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.781';
+  static version = 'v2.8.783';
   /**
    * Repository cli API
    * @static
@@ -122,6 +123,13 @@ class Underpost {
    * @memberof Underpost
    */
   static monitor = UnderpostMonitor.API;
+  /**
+   * LXD cli API
+   * @static
+   * @type {UnderpostLxd.API}
+   * @memberof Underpost
+   */
+  static lxd = UnderpostLxd.API;
 }
 
 const up = Underpost;