underpost 2.8.784 → 2.8.785

package/README.md

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

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.784
+## underpost ci/cd cli v2.8.785
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -219,6 +219,9 @@ Options:
   --pull-image         Set optional pull associated image
   --init-host          Install k8s node necessary cli env: kind, kubeadm,
                        docker, podman, helm
+  --config             Set k8s base node config
+  --post-config        Set k8s base node post config
+  --worker             Set worker node context
   -h, --help           display help for command
  
 ```
@@ -478,6 +481,7 @@ Options:
   --dev                     Set dev context env
   --create-virtual-network  Create lxd virtual network bridge
   --create-admin-profile    Create admin profile for lxd management
+  --control                 set control node vm context
   --create-vm <vm-id>       Create default virtual machines
   --init-vm <vm-id>         Get init vm underpost script
   --info-vm <vm-id>         Get all info vm

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.784'
+      engine.version: '2.8.785'
     networks:
       - load-balancer
 

package/manifests/lxd/underpost-setup.sh

@@ -25,8 +25,6 @@ EOF
 resize2fs /dev/sda2
 
 echo "Disk and filesystem resized successfully."
-
-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
@@ -34,6 +32,61 @@ NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 nvm install 23.8.0
 nvm use 23.8.0
+echo "
+██╗░░░██╗███╗░░██╗██████╗░███████╗██████╗░██████╗░░█████╗░░██████╗████████╗
+██║░░░██║████╗░██║██╔══██╗██╔════╝██╔══██╗██╔══██╗██╔══██╗██╔════╝╚══██╔══╝
+██║░░░██║██╔██╗██║██║░░██║█████╗░░██████╔╝██████╔╝██║░░██║╚█████╗░░░░██║░░░
+██║░░░██║██║╚████║██║░░██║██╔══╝░░██╔══██╗██╔═══╝░██║░░██║░╚═══██╗░░░██║░░░
+╚██████╔╝██║░╚███║██████╔╝███████╗██║░░██║██║░░░░░╚█████╔╝██████╔╝░░░██║░░░
+░╚═════╝░╚═╝░░╚══╝╚═════╝░╚══════╝╚═╝░░╚═╝╚═╝░░░░░░╚════╝░╚═════╝░░░░╚═╝░░░
+
+Installing underpost k8s node ...
+
+"
 npm install -g underpost
 chmod +x /root/.nvm/versions/node/v23.8.0/bin/underpost
 sudo modprobe br_netfilter
+mkdir -p /home/dd
+cd $(underpost root)/underpost
+underpost cluster --init-host
+
+# Default flags
+USE_KUBEADM=false
+USE_KIND=false
+USE_WORKER=false
+
+# Loop through arguments
+for arg in "$@"; do
+    case "$arg" in
+    --kubeadm)
+        USE_KUBEADM=true
+        ;;
+    --kind)
+        USE_KIND=true
+        ;;
+    --worker)
+        USE_WORKER=true
+        ;;
+    esac
+done
+
+underpost cluster --kubeadm
+underpost --reset
+
+# Behavior based on flags
+if $USE_KUBEADM; then
+    echo "Running control node with kubeadm..."
+    underpost cluster --kubeadm
+    kubectl get pods --all-namespaces -o wide -w
+fi
+
+if $USE_KIND; then
+    echo "Running control node with kind..."
+    underpost cluster
+    kubectl get pods --all-namespaces -o wide -w
+fi
+
+if $USE_WORKER; then
+    echo "Running worker..."
+    underpost cluster --worker --config --post-config
+fi

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.784",
+    "version": "2.8.785",
     "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

@@ -32,6 +32,9 @@ class UnderpostCluster {
         dedicatedGpu: false,
         kubeadm: false,
         initHost: false,
+        config: false,
+        postConfig: false,
+        worker: false,
       },
     ) {
       // sudo dnf update
@@ -41,6 +44,8 @@ class UnderpostCluster {
       // 4) Install LXD with MAAS from Rocky Linux docs
       // 5) Install MAAS src from snap
       if (options.initHost === true) return UnderpostCluster.API.initHost();
+      if (options.config) UnderpostCluster.API.config();
+      if (options.postConfig) UnderpostCluster.API.postConfig();
       const npmRoot = getNpmRootPath();
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
       if (options.infoCapacityPod === true) return logger.info('', UnderpostDeploy.API.resourcesFactory());
@@ -91,31 +96,16 @@ class UnderpostCluster {
         UnderpostDeploy.API.get('calico-kube-controllers')[0];
 
       if (
+        !options.worker &&
         !alrreadyCluster &&
         ((!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`);
-        shellExec(`sudo systemctl enable --now docker`);
-        shellExec(`sudo systemctl enable --now kubelet`);
-        shellExec(`containerd config default > /etc/containerd/config.toml`);
-        shellExec(`sed -i -e "s/SystemdCgroup = false/SystemdCgroup = true/g" /etc/containerd/config.toml`);
-        // shellExec(`cp /etc/kubernetes/admin.conf ~/.kube/config`);
-        // shellExec(`sudo systemctl restart kubelet`);
-        shellExec(`sudo service docker restart`);
-        shellExec(`sudo systemctl enable --now containerd.service`);
-        shellExec(`sudo swapoff -a; sudo sed -i '/swap/d' /etc/fstab`);
-        shellExec(`sudo systemctl daemon-reload`);
-        shellExec(`sudo systemctl restart containerd`);
+        UnderpostCluster.API.config();
         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"`,
           );
-          shellExec(`mkdir -p ~/.kube`);
-          shellExec(`sudo -E cp -i /etc/kubernetes/admin.conf ~/.kube/config`);
-          shellExec(`sudo -E chown $(id -u):$(id -g) ~/.kube/config`);
           // https://docs.tigera.io/calico/latest/getting-started/kubernetes/quickstart
           shellExec(
             `sudo kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.29.3/manifests/tigera-operator.yaml`,
@@ -140,8 +130,8 @@ class UnderpostCluster {
               }.yaml`,
             );
           }
-          shellExec(`sudo chown $(id -u):$(id -g) $HOME/.kube/config**`);
         }
+        UnderpostCluster.API.postConfig({ postConfig: true });
       } else logger.warn('Cluster already initialized');
 
       // shellExec(`sudo kubectl apply -f ${underpostRoot}/manifests/kubelet-config.yaml`);
@@ -288,6 +278,27 @@ class UnderpostCluster {
         shellExec(`sudo kubectl apply -f ${underpostRoot}/manifests/${letsEncName}.yaml`);
       }
     },
+
+    config(options = { postConfig: false }) {
+      if (options.postConfig === true) {
+        shellExec(`mkdir -p ~/.kube`);
+        shellExec(`sudo -E cp -i /etc/kubernetes/admin.conf ~/.kube/config`);
+        shellExec(`sudo -E chown $(id -u):$(id -g) ~/.kube/config`);
+        return;
+      }
+      shellExec(`sudo setenforce 0`);
+      shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
+      shellExec(`sudo systemctl enable --now docker`);
+      shellExec(`sudo systemctl enable --now kubelet`);
+      shellExec(`containerd config default > /etc/containerd/config.toml`);
+      shellExec(`sed -i -e "s/SystemdCgroup = false/SystemdCgroup = true/g" /etc/containerd/config.toml`);
+      shellExec(`sudo service docker restart`);
+      shellExec(`sudo systemctl enable --now containerd.service`);
+      shellExec(`sudo swapoff -a; sudo sed -i '/swap/d' /etc/fstab`);
+      shellExec(`sudo systemctl daemon-reload`);
+      shellExec(`sudo systemctl restart containerd`);
+      shellExec(`sysctl net.bridge.bridge-nf-call-iptables=1`);
+    },
     // This function performs a comprehensive reset of Kubernetes and container environments
     // on the host machine. Its primary goal is to clean up cluster components, temporary files,
     // and container data, ensuring a clean state for re-initialization or fresh deployments,

package/src/cli/index.js

@@ -112,6 +112,9 @@ program
   .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('--post-config', 'Set k8s base node post config')
+  .option('--worker', 'Set worker node context')
   .action(Underpost.cluster.init)
   .description('Manage cluster, for default initialization base kind cluster');
 
@@ -275,6 +278,7 @@ program
   .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('--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')

package/src/cli/lxd.js

@@ -10,7 +10,9 @@ class UnderpostLxd {
         dev: false,
         install: false,
         createVirtualNetwork: false,
-        initVm: false,
+        control: false,
+        worker: false,
+        initVm: '',
         createVm: '',
         infoVm: '',
         rootSize: '',
@@ -51,7 +53,8 @@ ipv6.address=none`);
         );
       }
       if (options.initVm && typeof options.initVm === 'string') {
-        pbcopy(`cat ${underpostRoot}/manifests/lxd/underpost-setup.sh | lxc exec ${options.initVm} -- bash`);
+        const flag = options.control === true ? '--kubeadm' : '';
+        pbcopy(`cat ${underpostRoot}/manifests/lxd/underpost-setup.sh | lxc exec ${options.initVm} -- bash -s ${flag}`);
       }
       if (options.infoVm && typeof options.infoVm === 'string') {
         shellExec(`lxc config show ${options.infoVm}`);

package/src/index.js

@@ -31,7 +31,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.784';
+  static version = 'v2.8.785';
   /**
    * Repository cli API
    * @static