underpost 2.8.785 → 2.8.787

package/README.md

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

package/bin/deploy.js

@@ -822,6 +822,9 @@ try {
     }
 
     case 'version-deploy': {
+      shellExec(
+        `underpost secret underpost --create-from-file /home/dd/engine/engine-private/conf/dd-cron/.env.production`,
+      );
       shellExec(`node bin/build dd conf`);
       shellExec(`git add . && cd ./engine-private && git add .`);
       shellExec(`node bin cmt . ci package-pwa-microservices-template`);

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.785
+## underpost ci/cd cli v2.8.787
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -220,8 +220,8 @@ Options:
   --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
+  --chown              Set k8s kube chown
   -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.785'
+      engine.version: '2.8.787'
     networks:
       - load-balancer
 

package/manifests/lxd/underpost-setup.sh

@@ -70,8 +70,12 @@ for arg in "$@"; do
     esac
 done
 
+echo "USE_KUBEADM = $USE_KUBEADM"
+echo "USE_KIND   = $USE_KIND"
+echo "USE_WORKER = $USE_WORKER"
+
 underpost cluster --kubeadm
-underpost --reset
+underpost cluster --reset
 
 # Behavior based on flags
 if $USE_KUBEADM; then
@@ -88,5 +92,5 @@ fi
 
 if $USE_WORKER; then
     echo "Running worker..."
-    underpost cluster --worker --config --post-config
+    underpost cluster --worker --config
 fi

package/package.json

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

@@ -33,8 +33,8 @@ class UnderpostCluster {
         kubeadm: false,
         initHost: false,
         config: false,
-        postConfig: false,
         worker: false,
+        chown: false,
       },
     ) {
       // sudo dnf update
@@ -44,8 +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();
+      if (options.config === true) UnderpostCluster.API.config();
+      if (options.chown === true) UnderpostCluster.API.chown();
       const npmRoot = getNpmRootPath();
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
       if (options.infoCapacityPod === true) return logger.info('', UnderpostDeploy.API.resourcesFactory());
@@ -106,6 +106,7 @@ class UnderpostCluster {
           shellExec(
             `sudo kubeadm init --pod-network-cidr=192.168.0.0/16 --control-plane-endpoint="${os.hostname()}:6443"`,
           );
+          UnderpostCluster.API.chown();
           // 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`,
@@ -123,6 +124,7 @@ class UnderpostCluster {
           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`);
+            UnderpostCluster.API.chown();
           } else {
             shellExec(
               `cd ${underpostRoot}/manifests && kind create cluster --config kind-config${
@@ -131,7 +133,6 @@ class UnderpostCluster {
             );
           }
         }
-        UnderpostCluster.API.postConfig({ postConfig: true });
       } else logger.warn('Cluster already initialized');
 
       // shellExec(`sudo kubectl apply -f ${underpostRoot}/manifests/kubelet-config.yaml`);
@@ -279,13 +280,7 @@ class UnderpostCluster {
       }
     },
 
-    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;
-      }
+    config() {
       shellExec(`sudo setenforce 0`);
       shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
       shellExec(`sudo systemctl enable --now docker`);
@@ -299,6 +294,11 @@ class UnderpostCluster {
       shellExec(`sudo systemctl restart containerd`);
       shellExec(`sysctl net.bridge.bridge-nf-call-iptables=1`);
     },
+    chown() {
+      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`);
+    },
     // 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/deploy.js

@@ -82,13 +82,13 @@ spec:
       containers:
         - name: ${deployId}-${env}-${suffix}
           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}"
+#          resources:
+#            requests:
+#              memory: "${resources.requests.memory}"
+#              cpu: "${resources.requests.cpu}"
+#            limits:
+#              memory: "${resources.limits.memory}"
+#              cpu: "${resources.limits.cpu}"
           command:
             - /bin/sh
             - -c

package/src/cli/index.js

@@ -113,8 +113,8 @@ program
   .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')
+  .option('--chown', 'Set k8s kube chown')
   .action(Underpost.cluster.init)
   .description('Manage cluster, for default initialization base kind cluster');
 

package/src/cli/lxd.js

@@ -53,8 +53,13 @@ ipv6.address=none`);
         );
       }
       if (options.initVm && typeof options.initVm === 'string') {
-        const flag = options.control === true ? '--kubeadm' : '';
-        pbcopy(`cat ${underpostRoot}/manifests/lxd/underpost-setup.sh | lxc exec ${options.initVm} -- bash -s ${flag}`);
+        let flag = '';
+        if (options.control === true) {
+          flag = ' -s -- --kubeadm';
+        } else if (options.worker == true) {
+          flag = ' -s -- --worker';
+        }
+        pbcopy(`cat ${underpostRoot}/manifests/lxd/underpost-setup.sh | lxc exec ${options.initVm} -- bash${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.785';
+  static version = 'v2.8.787';
   /**
    * Repository cli API
    * @static