underpost 2.8.812 → 2.8.814

package/README.md

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

package/bin/deploy.js

@@ -59,15 +59,13 @@ const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath,
   const [consumer_key, consumer_token, secret] = MAAS_API_TOKEN.split(`\n`)[0].split(':');
   const chronyConfPath = `/etc/chrony/chrony.conf`;
   const timezone = 'America/New_York';
-  const timeZoneSteps = [
-    `apt-get update`,
 
+  const timeZoneSteps = [
     `export DEBIAN_FRONTEND=noninteractive`,
 
     `ln -fs /usr/share/zoneinfo/${timezone} /etc/localtime`,
 
-    `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata`,
-    `dpkg-reconfigure --frontend noninteractive tzdata`,
+    `sudo dpkg-reconfigure --frontend noninteractive tzdata`,
   ];
   const keyboardSteps = [
     `sudo locale-gen en_US.UTF-8`,
@@ -78,46 +76,22 @@ const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath,
   ];
   // #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
   const installSteps = [
-    `apt update`,
-    `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony ntpdate keyboard-configuration`,
-    `ln -sf /lib/systemd/systemd /sbin/init`,
-
-    `echo 'deb http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
+    `cat <<EOF | tee /etc/apt/sources.list
+deb http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
 deb http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
-
-# Uncomment the following lines if you also need source packages (for building from source)
-# deb-src http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
-' > /etc/apt/sources.list`,
-    `apt update`,
-    `apt -y full-upgrade`,
-    // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
-
-    `systemctl enable ssh`,
+EOF`,
 
     `apt update -qq`,
+    `apt -y full-upgrade`,
     `apt install -y xinput x11-xkb-utils usbutils`,
+    // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
+    `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
+    `ln -sf /lib/systemd/systemd /sbin/init`,
 
-    // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
-    // `date`,
-
-    ...timeZoneSteps,
-    ...chronySetUp(chronyConfPath),
-    ...keyboardSteps,
-
-    // Create root user
-    `useradd -m -s /bin/bash -G sudo root`,
-    `echo 'root:root' | chpasswd`,
-    `mkdir -p /home/root/.ssh`,
-    `echo '${fs.readFileSync(
-      `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
-      'utf8',
-    )}' > /home/root/.ssh/authorized_keys`,
-    `chown -R root /home/root/.ssh`,
-    `chmod 700 /home/root/.ssh`,
-    `chmod 600 /home/root/.ssh/authorized_keys`,
+    `apt-get update`,
+    `DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils`,
+    `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup`,
   ];
 
   let steps = [
@@ -191,12 +165,12 @@ network:
   version: 2
   ethernets:
     ${process.env.RPI4_INTERFACE_NAME}:
-        dhcp4: false
+        dhcp4: true
         addresses:
           - ${ipaddr}/24
-        routes:
-          - to: default
-            via: ${gatewayip}
+#         routes:
+#           - to: default
+#             via: ${gatewayip}
 
 # chpasswd:
 #   expire: false
@@ -214,7 +188,6 @@ bootcmd:
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
   - echo "Init bootcmd"
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-  - ntpdate -u ${IP_ADDRESS} || ntpdate -u ${process.env.MAAS_NTP_SERVER}
 runcmd:
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
   - echo "Init runcmd"
@@ -264,6 +237,41 @@ echo 'nameserver 8.8.8.8' > /run/systemd/resolve/stub-resolv.conf
 ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
       'utf8',
     );
+
+    runSteps([
+      // `date -s "${shellExec(`date '+%Y-%m-%d %H:%M:%S'`, { stdout: true }).trim()}"`,
+      // `date`,
+      ...timeZoneSteps,
+      ...chronySetUp(chronyConfPath),
+      ...keyboardSteps,
+    ]);
+
+    runSteps([
+      `useradd -m -s /bin/bash -G sudo root`,
+      `echo 'root:root' | chpasswd`,
+      `mkdir -p /home/root/.ssh`,
+      `echo '${fs.readFileSync(
+        `/home/dd/engine/engine-private/deploy/id_rsa.pub`,
+        'utf8',
+      )}' > /home/root/.ssh/authorized_keys`,
+      `chown -R root /home/root/.ssh`,
+      `chmod 700 /home/root/.ssh`,
+      `chmod 600 /home/root/.ssh/authorized_keys`,
+    ]);
+  }
+
+  logger.info('Check virtual root user config');
+  {
+    const cmd = `sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF_OUTER'
+echo -e "\n=== Current date/time ==="
+date '+%Y-%m-%d %H:%M:%S'
+echo -e "\n=== Keyboard layout ==="
+cat /etc/default/keyboard
+echo -e "\n=== Registered users ==="
+cut -d: -f1 /etc/passwd
+EOF_OUTER`;
+
+    shellExec(cmd);
   }
 };
 

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.812
+## underpost ci/cd cli v2.8.814
 
 ### Usage: `underpost [options] [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.812'
+      engine.version: '2.8.814'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.812
+          image: localhost/rockylinux9-underpost:v2.8.814
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.812
+          image: localhost/rockylinux9-underpost:v2.8.814
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

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

@@ -508,20 +508,24 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`);
         logger.info('Phase 1/6: Cleaning up Kubernetes resources (PVCs, PVs) while API server is accessible...');
 
         // Get all Persistent Volumes and identify their host paths for data deletion.
-        const pvListJson = shellExec(`kubectl get pv -o json || echo '{"items":[]}'`, { stdout: true, silent: true });
-        const pvList = JSON.parse(pvListJson);
-
-        if (pvList.items && pvList.items.length > 0) {
-          for (const pv of pvList.items) {
-            // Check if the PV uses hostPath and delete its contents
-            if (pv.spec.hostPath && pv.spec.hostPath.path) {
-              const hostPath = pv.spec.hostPath.path;
-              logger.info(`Removing data from host path for PV '${pv.metadata.name}': ${hostPath}`);
-              shellExec(`sudo rm -rf ${hostPath}/* || true`);
+        try {
+          const pvListJson = shellExec(`kubectl get pv -o json || echo '{"items":[]}'`, { stdout: true, silent: true });
+          const pvList = JSON.parse(pvListJson);
+
+          if (pvList.items && pvList.items.length > 0) {
+            for (const pv of pvList.items) {
+              // Check if the PV uses hostPath and delete its contents
+              if (pv.spec.hostPath && pv.spec.hostPath.path) {
+                const hostPath = pv.spec.hostPath.path;
+                logger.info(`Removing data from host path for PV '${pv.metadata.name}': ${hostPath}`);
+                shellExec(`sudo rm -rf ${hostPath}/* || true`);
+              }
             }
+          } else {
+            logger.info('No Persistent Volumes found with hostPath to clean up.');
           }
-        } else {
-          logger.info('No Persistent Volumes found with hostPath to clean up.');
+        } catch (error) {
+          logger.error('Failed to clean up Persistent Volumes:', error);
         }
 
         // Phase 2: Stop Kubelet/K3s agent and remove CNI configuration

package/src/index.js

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